Merge "r4 version updates"

diff --combined version-manifest/src/main/resources/docker-manifest-staging.csv
index 523c30c,67f1ad0..f4d00be
--- 1/version-manifest/src/main/resources/docker-manifest-staging.csv
--- 2/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@@ -58,7 -58,7 +58,7 @@@ onap/multicloud/openstack-newton,1.2.
  onap/multicloud/openstack-ocata,1.2.3
  onap/multicloud/openstack-pike,1.2.3
  onap/multicloud/openstack-windriver,1.2.3
 -onap/multicloud/vio,1.2.1
 +onap/multicloud/vio,1.2.3
  onap/multicloud/vio-vesagent,1.0.0
  onap/music/cassandra_3_11,3.0.24
  onap/music/cassandra_job,3.0.24
@@@ -71,8 -71,8 +71,8 @@@ onap/optf-cmso-dbinit,1.0.
  onap/optf-cmso-service,1.0.1
  onap/optf-has,1.2.5
  onap/optf-osdf,1.2.4
- onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server,1.0.4
- onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main,1.0.0
+ onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server,1.1.1
+ onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main,1.1.0-SNAPSHOT
  onap/org.onap.dcaegen2.collectors.snmptrap,1.4.0
  onap/org.onap.dcaegen2.collectors.ves.vescollector,1.3.1
  onap/org.onap.dcaegen2.deployments.bootstrap,1.1.3
@@@ -84,9 -84,9 +84,9 @@@ onap/org.onap.dcaegen2.deployments.tca-
  onap/org.onap.dcaegen2.deployments.tls-init-container,1.0.0
  onap/org.onap.dcaegen2.platform.cdapbroker,4.1.0
  onap/org.onap.dcaegen2.platform.configbinding.app-app,2.2.3
- onap/org.onap.dcaegen2.platform.deployment-handler,3.0.3
+ onap/org.onap.dcaegen2.platform.deployment-handler,3.1.0
  onap/org.onap.dcaegen2.platform.inventory-api,3.0.4
- onap/org.onap.dcaegen2.platform.policy-handler,4.4.0
+ onap/org.onap.dcaegen2.platform.policy-handler,4.5.0
  onap/org.onap.dcaegen2.platform.servicechange-handler,1.1.5
  onap/org.onap.dcaegen2.services.prh.prh-app-server,1.1.1
  onap/policy-apex-pdp,2.1-SNAPSHOT-latest
@@@ -119,15 -119,15 +119,15 @@@ onap/sdnc-ueb-listener-image,1.4-STAGIN
  onap/search-data-service,1.3-STAGING-latest
  onap/service-decomposition,1.4.2
  onap/sniroemulator,1.0.0
 -onap/so/api-handler-infra,1.3.2-STAGING-latest
 -onap/so/bpmn-infra,1.3.2-STAGING-latest
 -onap/so/catalog-db-adapter,1.3.2-STAGING-latest
 -onap/so/openstack-adapter,1.3.2-STAGING-latest
 -onap/so/request-db-adapter,1.3.2-STAGING-latest
 -onap/so/sdc-controller,1.3.2-STAGING-latest
 -onap/so/sdnc-adapter,1.3.2-STAGING-latest
 -onap/so/so-monitoring,1.3.2-STAGING-latest
 -onap/so/vfc-adapter,1.3.2-STAGING-latest
 +onap/so/api-handler-infra,1.3.6-STAGING-latest
 +onap/so/bpmn-infra,1.3.6-STAGING-latest
 +onap/so/catalog-db-adapter,1.3.6-STAGING-latest
 +onap/so/openstack-adapter,1.3.6-STAGING-latest
 +onap/so/request-db-adapter,1.3.6-STAGING-latest
 +onap/so/sdc-controller,1.3.6-STAGING-latest
 +onap/so/sdnc-adapter,1.3.6-STAGING-latest
 +onap/so/so-monitoring,1.3.6-STAGING-latest
 +onap/so/vfc-adapter,1.3.6-STAGING-latest
  onap/sparky-be,1.3-STAGING-latest
  onap/spike,1.3-STAGING-latest
  onap/testsuite,1.4.0-STAGING-latest

diff --combined version-manifest/src/main/resources/docker-manifest.csv
index e8f2828,b0a408d..abe9612
--- 1/version-manifest/src/main/resources/docker-manifest.csv
--- 2/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@@ -58,7 -58,7 +58,7 @@@ onap/multicloud/openstack-newton,1.2.
  onap/multicloud/openstack-ocata,1.2.2
  onap/multicloud/openstack-pike,1.2.2
  onap/multicloud/openstack-windriver,1.2.2
 -onap/multicloud/vio,1.2.1
 +onap/multicloud/vio,1.2.3
  onap/multicloud/vio-vesagent,1.0.0
  onap/music/cassandra_3_11,3.0.24
  onap/music/cassandra_job,3.0.24
@@@ -71,8 -71,8 +71,8 @@@ onap/optf-cmso-dbinit,1.0.
  onap/optf-cmso-service,1.0.1
  onap/optf-has,1.2.5
  onap/optf-osdf,1.2.4
- onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server,1.0.4
- onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main,1.0.0
+ onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server,1.0.5
+ onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main,1.0.2
  onap/org.onap.dcaegen2.collectors.snmptrap,1.4.0
  onap/org.onap.dcaegen2.collectors.ves.vescollector,1.3.1
  onap/org.onap.dcaegen2.deployments.bootstrap,1.1.3
@@@ -120,15 -120,15 +120,15 @@@ onap/sdnc-ueb-listener-image,1.4.
  onap/search-data-service,1.3.1
  onap/service-decomposition,1.4.2
  onap/sniroemulator,1.0.0
 -onap/so/api-handler-infra,1.3.2
 -onap/so/bpmn-infra,1.3.2
 -onap/so/catalog-db-adapter,1.3.2
 -onap/so/openstack-adapter,1.3.2
 -onap/so/request-db-adapter,1.3.2
 -onap/so/sdc-controller,1.3.2
 -onap/so/sdnc-adapter,1.3.2
 -onap/so/so-monitoring,1.3.2
 -onap/so/vfc-adapter,1.3.2
 +onap/so/api-handler-infra,1.3.6
 +onap/so/bpmn-infra,1.3.6
 +onap/so/catalog-db-adapter,1.3.6
 +onap/so/openstack-adapter,1.3.6
 +onap/so/request-db-adapter,1.3.6
 +onap/so/sdc-controller,1.3.6
 +onap/so/sdnc-adapter,1.3.6
 +onap/so/so-monitoring,1.3.6
 +onap/so/vfc-adapter,1.3.6
  onap/sparky-be,1.3.0
  onap/spike,1.3.1
  onap/testsuite,1.3.2

diff --combined version-manifest/src/main/resources/java-manifest.csv
index a7765d2,f52fdc6..b526857
--- 1/version-manifest/src/main/resources/java-manifest.csv
--- 2/version-manifest/src/main/resources/java-manifest.csv
+++ b/version-manifest/src/main/resources/java-manifest.csv
@@@ -179,15 -179,15 +179,15 @@@ org.onap.dcaegen2.analytics.tca,dcae-an
  org.onap.dcaegen2.analytics.tca,dcae-analytics-model,2.2.0
  org.onap.dcaegen2.analytics.tca,dcae-analytics-tca,2.2.0
  org.onap.dcaegen2.analytics.tca,dcae-analytics-test,2.2.0
- org.onap.dcaegen2.collectors,datafile,1.0.3
- org.onap.dcaegen2.collectors.datafile,datafile-app-server,1.0.3
- org.onap.dcaegen2.collectors.datafile,datafile-commons,1.0.3
- org.onap.dcaegen2.collectors.datafile,datafile-dmaap-client,1.0.3
- org.onap.dcaegen2.collectors.hv-ves,hv-collector-domain,1.0.0
- org.onap.dcaegen2.collectors.hv-ves,hv-collector-health-check,1.0.0
- org.onap.dcaegen2.collectors.hv-ves,hv-collector-main,1.0.0
- org.onap.dcaegen2.collectors.hv-ves,hv-collector-utils,1.0.0
- org.onap.dcaegen2.collectors.hv-ves,ves-hv-collector,1.0.0
+ org.onap.dcaegen2.collectors,datafile,1.1.1
+ org.onap.dcaegen2.collectors.datafile,datafile-app-server,1.1.1
+ org.onap.dcaegen2.collectors.datafile,datafile-commons,1.1.1
+ org.onap.dcaegen2.collectors.datafile,datafile-dmaap-client,1.1.1
+ org.onap.dcaegen2.collectors.hv-ves,hv-collector-domain,1.1.0
+ org.onap.dcaegen2.collectors.hv-ves,hv-collector-health-check,1.1.0
+ org.onap.dcaegen2.collectors.hv-ves,hv-collector-main,1.1.0
+ org.onap.dcaegen2.collectors.hv-ves,hv-collector-utils,1.1.0
+ org.onap.dcaegen2.collectors.hv-ves,ves-hv-collector,1.1.0
  org.onap.dcaegen2.collectors.ves,VESCollector,1.3.1
  org.onap.dcaegen2.platform,inventory-api,1.0.0
  org.onap.dcaegen2.platform,servicechange-handler,1.0.0
@@@ -223,7 -223,7 +223,7 @@@ org.onap.multicloud.openstack,newton,1.
  org.onap.multicloud.openstack,ocata,1.2.2
  org.onap.multicloud.openstack,windriver,1.2.2
  org.onap.multicloud.openstack.vmware,vesagent,1.0.0
 -org.onap.multicloud.openstack.vmware,vio,1.2.1
 +org.onap.multicloud.openstack.vmware,vio,1.2.3
  org.onap.music,MUSIC,3.0.23
  org.onap.oparent,oparent,1.2.2
  org.onap.policy.apex-pdp,apex-pdp,2.0.3