Merge "Upgrade vfModule popup: show version from instance or model."
diff --git a/deliveries/pom.xml b/deliveries/pom.xml
index 66e7908..32402fe 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.3-SNAPSHOT</version>
+ <version>6.0.4-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index f13b79c..fda80a3 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -10,6 +10,15 @@
**Resolved Issues**
+ - `↗ <https://jira.onap.org/browse/VID-365>`__ Upgrade AAI version to v16
+ - `↗ <https://jira.onap.org/browse/VID-479>`__ VID Does not refresh after Add VF Module fails
+ - `↗ <https://jira.onap.org/browse/VID-659>`__ VID generates always the same VF module name during scale out
+ - `↗ <https://jira.onap.org/browse/VID-773>`__ SDNC Preload URL updated to https
+
+ - `↗ <https://jira.onap.org/browse/VID-755>`__ Upgrade direct dependent packages to the latest version
+ - `↗ <https://jira.onap.org/browse/VID-498>`__ Java 11 migration from JDK 8
+ - `↗ <https://jira.onap.org/browse/VID-471>`__ Update to Portal SDK v2.6
+
**Security Notes**
diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index 64ea9ec..4ef0372 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.3-SNAPSHOT</version>
+ <version>6.0.4-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 ce5339b..055bbb1 100644
--- a/epsdk-app-onap/version.properties
+++ b/epsdk-app-onap/version.properties
@@ -4,7 +4,7 @@
major=6
minor=0
-patch=3
+patch=4
base_version=${major}.${minor}.${patch}
diff --git a/pom.xml b/pom.xml
index 00661bf..7b767a8 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.3-SNAPSHOT</version>
+ <version>6.0.4-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.3-SNAPSHOT</build.version>
+ <build.version>6.0.4-SNAPSHOT</build.version>
<nexusproxy>https://nexus.onap.org</nexusproxy>
<snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>content/repositories/releases/</releaseNexusPath>
diff --git a/releases/6.0.3-container.yaml b/releases/6.0.3-container.yaml
new file mode 100644
index 0000000..7ff20c7
--- /dev/null
+++ b/releases/6.0.3-container.yaml
@@ -0,0 +1,8 @@
+distribution_type: 'container'
+container_release_tag: '6.0.3'
+project: 'vid'
+log_dir: 'vid-maven-docker-stage-master/294/'
+ref: 03658e97c41cce22f20ac04d69038103089b4f05
+containers:
+ - name: 'vid'
+ version: '6.0.3-20200304T121926Z'
\ No newline at end of file
diff --git a/version.properties b/version.properties
index ce5339b..055bbb1 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
major=6
minor=0
-patch=3
+patch=4
base_version=${major}.${minor}.${patch}
diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index c1e3fb9..d1632c5 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.3-SNAPSHOT</version>
+ <version>6.0.4-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 ce5339b..055bbb1 100755
--- a/vid-app-common/version.properties
+++ b/vid-app-common/version.properties
@@ -4,7 +4,7 @@
major=6
minor=0
-patch=3
+patch=4
base_version=${major}.${minor}.${patch}
diff --git a/vid-webpack-master/pom.xml b/vid-webpack-master/pom.xml
index d40290f..3f6f946 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.3-SNAPSHOT</version>
+ <version>6.0.4-SNAPSHOT</version>
<packaging>war</packaging>
<name>VID UI</name>
<description>VID UI</description>