Merge "[MOD/Runtime] Upgrade to Helmgen-core 1.0.4"

4 files changed, 120 insertions, 117 deletions

diff --git a/mod/runtimeapi/Changelog.md b/mod/runtimeapi/Changelog.md
index 23168b8..9f31f72 100644
--- a/mod/runtimeapi/Changelog.md
+++ b/mod/runtimeapi/Changelog.md
@@ -5,6 +5,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/).
 
+## [1.3.3] - 2022-06-03
+- [DCAEGEN2-3087] Switch helmgen-core version to 1.0.4 (includes fix for log path)
+
 ## [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
diff --git a/mod/runtimeapi/pom.xml b/mod/runtimeapi/pom.xml
index 7188527..56a0626 100644
--- a/mod/runtimeapi/pom.xml
+++ b/mod/runtimeapi/pom.xml
@@ -2,8 +2,7 @@
 <!--
 ============LICENSE_START=======================================================
 Copyright (c) 2019-2022 AT&T Intellectual Property. All rights reserved.
-================================================================================
-Modifications Copyright (c) 2020 Nokia
+Copyright (c) 2020 Nokia
 ================================================================================
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,114 +18,114 @@ limitations under the License.
 ============LICENSE_END=========================================================
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<packaging>pom</packaging>
-	<modules>
-		<module>runtime-core</module>
-		<module>runtime-web</module>
-	</modules>
-	<parent>
-		<groupId>org.onap.oparent</groupId>
-		<artifactId>oparent</artifactId>
-		<version>2.0.0</version>
-	</parent>
-	<groupId>org.onap.dcaegen2.platform.mod</groupId>
-	<artifactId>runtimeapi</artifactId>
-	<version>1.3.2</version>
-	<name>dcaegen2-platform-mod-runtimeapi</name>
-	<description>MOD Runtime API</description>
-	<properties>
-		<maven.deploy.skip>true</maven.deploy.skip>
-		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
-		<sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
-		</sonar.coverage.jacoco.xmlReportPaths>
-		<enforcer.skip>true</enforcer.skip>
-	</properties>
-	<profiles>
-		<profile>
-			<id>java11</id>
-			<properties>
-				<maven.compiler.source>11</maven.compiler.source>
-				<maven.compiler.target>11</maven.compiler.target>
-				<maven.compiler.release>11</maven.compiler.release>
-			</properties>
-			<activation>
-			<property>
-				<name>m2e.version</name>
-			</property>
-			<activeByDefault>true</activeByDefault>
-		</activation>
-		</profile>
-		<profile>
-			<id>java8</id>
-			<properties>
-				<maven.compiler.source>1.8</maven.compiler.source>
-				<maven.compiler.target>1.8</maven.compiler.target>
-			</properties>
-		</profile>
-	</profiles>
-	<dependencies>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>2.8.0</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<!-- support sonar in multi-module project -->
-			<plugin>
-				<groupId>org.sonarsource.scanner.maven</groupId>
-				<artifactId>sonar-maven-plugin</artifactId>
-				<version>3.6.0.1398</version>
-			</plugin>
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>pom</packaging>
+    <modules>
+        <module>runtime-core</module>
+        <module>runtime-web</module>
+    </modules>
+    <parent>
+        <groupId>org.onap.oparent</groupId>
+        <artifactId>oparent</artifactId>
+        <version>2.0.0</version>
+    </parent>
+    <groupId>org.onap.dcaegen2.platform.mod</groupId>
+    <artifactId>runtimeapi</artifactId>
+    <version>1.3.3</version>
+    <name>dcaegen2-platform-mod-runtimeapi</name>
+    <description>MOD Runtime API</description>
+    <properties>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
+        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
+        </sonar.coverage.jacoco.xmlReportPaths>
+        <enforcer.skip>true</enforcer.skip>
+    </properties>
+    <profiles>
+        <profile>
+            <id>java11</id>
+            <properties>
+                <maven.compiler.source>11</maven.compiler.source>
+                <maven.compiler.target>11</maven.compiler.target>
+                <maven.compiler.release>11</maven.compiler.release>
+            </properties>
+            <activation>
+            <property>
+                <name>m2e.version</name>
+            </property>
+            <activeByDefault>true</activeByDefault>
+        </activation>
+        </profile>
+        <profile>
+            <id>java8</id>
+            <properties>
+                <maven.compiler.source>1.8</maven.compiler.source>
+                <maven.compiler.target>1.8</maven.compiler.target>
+            </properties>
+        </profile>
+    </profiles>
+    <dependencies>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.8.0</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <!-- support sonar in multi-module project -->
+            <plugin>
+                <groupId>org.sonarsource.scanner.maven</groupId>
+                <artifactId>sonar-maven-plugin</artifactId>
+                <version>3.6.0.1398</version>
+            </plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>1.4.1</version>
-				<executions>
-					<execution>
-						<id>enforce-no-snapshots</id>
-						<goals>
-							<goal>enforce</goal>
-						</goals>
-						<configuration>
-							<rules>
-								<requireReleaseDeps>
-									<message>No Snapshots Allowed!</message>
-								</requireReleaseDeps>
-							</rules>
-							<fail>false</fail>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>1.4.1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-no-snapshots</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireReleaseDeps>
+                                    <message>No Snapshots Allowed!</message>
+                                </requireReleaseDeps>
+                            </rules>
+                            <fail>false</fail>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 
-		</plugins>
-	</build>
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-starter-parent</artifactId>
-				<version>2.1.7.RELEASE</version>
-				<type>pom</type>
-				<scope>import</scope>
-				<exclusions>
-					<exclusion>
-						<groupId>org.springframework.plugin</groupId>
-						<artifactId>spring-plugin-core</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.plugin</groupId>
-				<artifactId>spring-plugin-core</artifactId>
-				<version>2.0.0.RELEASE</version>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
+        </plugins>
+    </build>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-parent</artifactId>
+                <version>2.1.7.RELEASE</version>
+                <type>pom</type>
+                <scope>import</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.springframework.plugin</groupId>
+                        <artifactId>spring-plugin-core</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.plugin</groupId>
+                <artifactId>spring-plugin-core</artifactId>
+                <version>2.0.0.RELEASE</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 </project>
diff --git a/mod/runtimeapi/runtime-core/pom.xml b/mod/runtimeapi/runtime-core/pom.xml
index 5970bfd..3ca24e7 100644
--- a/mod/runtimeapi/runtime-core/pom.xml
+++ b/mod/runtimeapi/runtime-core/pom.xml
@@ -24,13 +24,13 @@ limitations under the License.
     <parent>
         <artifactId>runtimeapi</artifactId>
         <groupId>org.onap.dcaegen2.platform.mod</groupId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>runtime-core</artifactId>
-    <version>1.3.2</version>
-
+    <version>1.3.3</version>
+    <properties><onap-gerrit-review>-changelog-missing</onap-gerrit-review></properties>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -50,7 +50,7 @@ limitations under the License.
         <dependency>
             <groupId>org.onap.dcaegen2.platform</groupId>
             <artifactId>helmchartgenerator-core</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4</version>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
diff --git a/mod/runtimeapi/runtime-web/pom.xml b/mod/runtimeapi/runtime-web/pom.xml
index af89495..01ea8fd 100644
--- a/mod/runtimeapi/runtime-web/pom.xml
+++ b/mod/runtimeapi/runtime-web/pom.xml
@@ -23,18 +23,19 @@ limitations under the License.
     <parent>
         <groupId>org.onap.dcaegen2.platform.mod</groupId>
         <artifactId>runtimeapi</artifactId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
     </parent>
     <artifactId>runtime-web</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
     <packaging>jar</packaging>
+    <properties><onap-gerrit-review>-changelog-missing</onap-gerrit-review></properties>
     <name>runtime-web</name>
     <description>MOD Runtime Web Module</description>
     <dependencies>
         <dependency>
             <groupId>org.onap.dcaegen2.platform.mod</groupId>
             <artifactId>runtime-core</artifactId>
-            <version>1.3.2</version>
+            <version>1.3.3</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>