10 files changed, 30 insertions, 14 deletions
diff --git a/deliveries/pom.xml b/deliveries/pom.xml
index e4a59bda8..6c8951332 100755
--- a/deliveries/pom.xml
+++ b/deliveries/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.vid</groupId>
         <artifactId>vid-parent</artifactId>
-        <version>6.0.5-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
 
     <packaging>pom</packaging>
diff --git a/docs/installation.rst b/docs/installation.rst
index 212925318..c8f4eb1fb 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -17,7 +17,7 @@ Please follow the instructions given below, for installing VID using a Docker im
 
   docker pull mariadb:10
   docker login -u docker -p docker nexus3.onap.org:10001
-  docker pull nexus3.onap.org:10001/onap/vid:5.0.3
+  docker pull nexus3.onap.org:10001/onap/vid:7.0.0
 
 2. Install by running following command (Use the path for the lf_config folder under the VID git repository as CONFIG_PATH and path for .jks files for CERTS_PATH, usually epsdk-app-onap/src/main/webapp/WEB-INF/cert )
 
@@ -27,7 +27,7 @@ Please follow the instructions given below, for installing VID using a Docker im
    docker run --name vid-mariadb -e MYSQL_DATABASE=vid_openecomp_epsdk -e MYSQL_USER=vidadmin -e MYSQL_PASSWORD=YOUR_PASSWORD -e MYSQL_ROOT_PASSWORD=ROOT_PASSWORD -v CONFIG_PATH/vid-my.cnf:/etc/mysql/my.cnf -v /var/lib/mysql -d mariadb:10
    
    #start VID server
-   docker run -e VID_MYSQL_DBNAME=vid_openecomp_epsdk -e VID_MYSQL_PASS=YOUR_PASSWORD -v CERTS_PATH:/opt/app/vid/etc --name vid-server -p 8080:8080 --link vid-mariadb:vid-mariadb-docker-instance -d nexus3.onap.org:10001/onap/vid:5.0.3
+   docker run -e VID_MYSQL_DBNAME=vid_openecomp_epsdk -e VID_MYSQL_PASS=YOUR_PASSWORD -v CERTS_PATH:/opt/app/vid/etc --name vid-server -p 8080:8080 --link vid-mariadb:vid-mariadb-docker-instance -d nexus3.onap.org:10001/onap/vid:7.0.0
 
 Or use docker-compose:
 
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 820267dca..17efe69ed 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -29,6 +29,22 @@ Version: Frankfurt (6.0.x)
 
 
 
+Version: Guilin (7.0.x)
+------------------------
+**Known Issues**
+
+
+**Resolved Issues**
+
+
+**Security Notes**
+
+*Fixed Security Issues*
+
+*Known Security Issues*
+
+
+
 Version: El-Alto (5.0.x)
 ------------------------
 **Known Issues**
diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index 79af9f058..9727b7459 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>6.0.5-SNAPSHOT</version>
+    <version>7.0.0-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 5617b19cf..9edd4819f 100644
--- a/epsdk-app-onap/version.properties
+++ b/epsdk-app-onap/version.properties
@@ -2,9 +2,9 @@
 # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
 # because they are used in Jenkins, whose plug-in doesn't support
 
-major=6
+major=7
 minor=0
-patch=5
+patch=0
 
 base_version=${major}.${minor}.${patch}
 
diff --git a/pom.xml b/pom.xml
index 233a178a5..fc23a4804 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>6.0.5-SNAPSHOT</version>
+    <version>7.0.0-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>6.0.5-SNAPSHOT</build.version>
+        <build.version>7.0.0-SNAPSHOT</build.version>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
         <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
         <releaseNexusPath>content/repositories/releases/</releaseNexusPath>
diff --git a/version.properties b/version.properties
index 5617b19cf..9edd4819f 100644
--- a/version.properties
+++ b/version.properties
@@ -2,9 +2,9 @@
 # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
 # because they are used in Jenkins, whose plug-in doesn't support
 
-major=6
+major=7
 minor=0
-patch=5
+patch=0
 
 base_version=${major}.${minor}.${patch}
 
diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index d50a099d5..b894ebefc 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>6.0.5-SNAPSHOT</version>
+    <version>7.0.0-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>VID Common</name>
     <description>VID Common code for opensource version</description>
diff --git a/vid-app-common/version.properties b/vid-app-common/version.properties
index 5617b19cf..9edd4819f 100755
--- a/vid-app-common/version.properties
+++ b/vid-app-common/version.properties
@@ -2,9 +2,9 @@
 # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
 # because they are used in Jenkins, whose plug-in doesn't support
 
-major=6
+major=7
 minor=0
-patch=5
+patch=0
 
 base_version=${major}.${minor}.${patch}
 
diff --git a/vid-webpack-master/pom.xml b/vid-webpack-master/pom.xml
index d556289bd..bdb7680a9 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>6.0.5-SNAPSHOT</version>
+  <version>7.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>VID UI</name>
   <description>VID UI</description>