From 545da32aba372bedd1f338ca00ce04dcd93536cf Mon Sep 17 00:00:00 2001
From: Rachitha Ramappa <rachitha.ramappa@att.com>
Date: Thu, 5 Nov 2020 20:42:19 +0530
Subject: The following change are for release VID's RC1 for Guilin release

Change-Id: I26060228813b0bfb51c1eea7441091e755539c2f
Issue-ID: VID-902
Signed-off-by: rachitha.ramappa@att.com
---
 deliveries/pom.xml                | 4 ++--
 docs/release-notes.rst            | 5 +++--
 epsdk-app-onap/pom.xml            | 2 +-
 epsdk-app-onap/version.properties | 2 +-
 pom.xml                           | 4 ++--
 releases/7.0.2-container.yaml     | 8 ++++++++
 version.properties                | 2 +-
 vid-app-common/pom.xml            | 2 +-
 vid-webpack-master/pom.xml        | 2 +-
 9 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 releases/7.0.2-container.yaml

diff --git a/deliveries/pom.xml b/deliveries/pom.xml
index 055941d2b..a2f3b243d 100755
--- a/deliveries/pom.xml
+++ b/deliveries/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.vid</groupId>
         <artifactId>vid-parent</artifactId>
-        <version>7.0.1-SNAPSHOT</version>
+        <version>7.0.2-SNAPSHOT</version>
     </parent>
 
     <packaging>pom</packaging>
@@ -64,7 +64,7 @@
                                     <descriptor>assembly/assembly-for-plugin.xml</descriptor>
                                 </assembly>
                                 <tags>
-                                    <tag>6.0-STAGING-latest</tag>
+                                    <tag>7.0-STAGING-latest</tag>
                                     <tag>latest</tag>
                                     <tag>${docker.tag}</tag>
                                     <tag>${docker.latest.tag}</tag>
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 3efea036e..b9f13a13b 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -10,7 +10,7 @@ Version: Guilin (7.0.x)
 :In a nutshell...:
 
 
-The followinng areas have received improvements in Guilin Release
+The following areas have received improvements in Guilin Release
 
    Pause:
       * Pause/Stop on Failures.
@@ -20,7 +20,7 @@ The followinng areas have received improvements in Guilin Release
    Audit Info:
       * Overhauling of the Audit Info screen popup.
       * MSO Status table can now be exported and viewed as .csv files (in Excel and other type software)
-      * Audit Info pate is also refreshable now. New status from MSO will arrive upton pressing the refresh button.
+      * Audit Info page is also refreshable now. New status from MSO will arrive upon pressing the refresh button.
 
    VF Module Sequencing and Base Module Related Rules:
      * The sequence of VF Modules can now be changed by dragging up and down in the drawing board.
@@ -48,6 +48,7 @@ This section is empty.
        https://jira.onap.org/browse/VID-861
        https://jira.onap.org/browse/VID-860
        https://jira.onap.org/browse/VID-858
+       https://jira.onap.org/browse/VID-890
 
 
 **Security Notes**
diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index 0cd8b35ea..4672c0b26 100755
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -8,7 +8,7 @@
         the Portal team. -->
     <groupId>org.onap.vid</groupId>
     <artifactId>epsdk-app-onap</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>ECOMP SDK Webapp for OpenSource</name>
     <description>ECOMP SDK Web Application for public release</description>
diff --git a/epsdk-app-onap/version.properties b/epsdk-app-onap/version.properties
index 162ff840b..0ec355a05 100644
--- a/epsdk-app-onap/version.properties
+++ b/epsdk-app-onap/version.properties
@@ -4,7 +4,7 @@
 
 major=7
 minor=0
-patch=1
+patch=2
 
 base_version=${major}.${minor}.${patch}
 
diff --git a/pom.xml b/pom.xml
index b8ef963c7..a3e8fa96b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.vid</groupId>
     <artifactId>vid-parent</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>vid</name>
 
@@ -86,7 +86,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <build.version>7.0.1-SNAPSHOT</build.version>
+        <build.version>7.0.2-SNAPSHOT</build.version>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
         <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
         <releaseNexusPath>content/repositories/releases/</releaseNexusPath>
diff --git a/releases/7.0.2-container.yaml b/releases/7.0.2-container.yaml
new file mode 100644
index 000000000..5d374956a
--- /dev/null
+++ b/releases/7.0.2-container.yaml
@@ -0,0 +1,8 @@
+distribution_type: 'container'
+container_release_tag: '7.0.2'
+project: 'vid'
+log_dir: 'vid-maven-docker-stage-master/547/'
+ref: 62bb1f83ba6658184d23bbaa465eb80011de3b2b
+containers:
+  - name: 'vid'
+    version: '7.0.1-20201105T134743Z'
\ No newline at end of file
diff --git a/version.properties b/version.properties
index 162ff840b..0ec355a05 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 
 major=7
 minor=0
-patch=1
+patch=2
 
 base_version=${major}.${minor}.${patch}
 
diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index a9ea6842c..e55f3c62e 100755
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -9,7 +9,7 @@
         inherit from a parent maven module. -->
     <groupId>org.onap.vid</groupId>
     <artifactId>vid-app-common</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>VID Common</name>
     <description>VID Common code for opensource version</description>
diff --git a/vid-webpack-master/pom.xml b/vid-webpack-master/pom.xml
index bd66c6141..31feddbb2 100644
--- a/vid-webpack-master/pom.xml
+++ b/vid-webpack-master/pom.xml
@@ -9,7 +9,7 @@
       inherit from a parent maven module. -->
   <groupId>org.onap.vid</groupId>
   <artifactId>vid-webpack-master</artifactId>
-  <version>7.0.1-SNAPSHOT</version>
+  <version>7.0.2-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>VID UI</name>
   <description>VID UI</description>
-- 
cgit 1.2.3-korg