Merge "Updated the docker-staging-manifest to new version"

diff --combined version-manifest/src/main/resources/docker-manifest-staging.csv
index 92028d6,1a1fbf7..0b338ab
--- 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
@@@ -1,11 -1,11 +1,11 @@@
  image,tag
 -onap/aaf/aaf_cm,2.1.1
 -onap/aaf/aaf_fs,2.1.1
 -onap/aaf/aaf_gui,2.1.1
 -onap/aaf/aaf_hello,2.1.1
 -onap/aaf/aaf_locate,2.1.1
 -onap/aaf/aaf_oauth,2.1.1
 -onap/aaf/aaf_service,2.1.1
 +onap/aaf/aaf_cm,2.1.2-SNAPSHOT
 +onap/aaf/aaf_fs,2.1.2-SNAPSHOT
 +onap/aaf/aaf_gui,2.1.2-SNAPSHOT
 +onap/aaf/aaf_hello,2.1.2-SNAPSHOT
 +onap/aaf/aaf_locate,2.1.2-SNAPSHOT
 +onap/aaf/aaf_oauth,2.1.2-SNAPSHOT
 +onap/aaf/aaf_service,2.1.2-SNAPSHOT
  onap/aaf/sms,2.0.0
  onap/aaf/smsquorumclient,2.0.0
  onap/aai-resources,1.2.2
@@@ -13,27 -13,26 +13,27 @@@ onap/aai-traversal,1.2.
  onap/aai/esr-gui,1.1.0
  onap/aai/esr-server,1.1.0
  onap/admportal-sdnc-image,1.4-STAGING-latest
 -onap/appc-cdt-image,1.3.0
 +onap/appc-cdt-image,1.4.0-SNAPSHOT-latest
  onap/appc-image,1.4.0-SNAPSHOT-latest
  onap/babel,1.2.0
  onap/ccsdk-dgbuilder-image,0.3-STAGING-latest
  onap/ccsdk-odl-image,0.3-STAGING-latest
  onap/ccsdk-odlsli-image,0.3-STAGING-latest
  onap/champ,1.2.3
 -onap/clamp,2.0.2
 +onap/clamp,3.0-STAGING-latest
  onap/cli,2.0.2
  onap/data-router,1.2.2
  onap/dmaap/buscontroller,1.0.12
 -onap/dmaap/dmaap-mr,1.1.4
 -onap/externalapi/nbi,2.0.0
 +onap/dmaap/dmaap-mr,1.1.6
 +onap/dmaap/kafka01101,0.0.1
 +onap/externalapi/nbi,3.0.0-latest
  onap/gizmo,1.2.1
 -onap/holmes/engine-management,1.1.0
 -onap/holmes/rule-management,1.1.0
 +onap/holmes/engine-management,1.2.0-STAGING-latest
 +onap/holmes/rule-management,1.2.0-STAGING-latest
  onap/model-loader,1.2.1
  onap/msb/msb_apigateway,1.2.0-STAGING-latest
  onap/msb/msb_discovery,1.2.0-STAGING-latest
 -onap/multicloud/framework,1.1.2
 +onap/multicloud/framework,1.2.0-STAGING
  onap/multicloud/openstack-newton,1.2.0-STAGING
  onap/multicloud/openstack-ocata,1.2.0-STAGING
  onap/multicloud/openstack-windriver,1.2.0-STAGING
@@@ -41,10 -40,9 +41,10 @@@ onap/multicloud/vio,1.1.
  onap/multicloud/vio-vesagent,1.0.0
  onap/music/cassandra_music,3.0.0
  onap/music/music,2.5.3
 +onap/music/prom,1.0.5-latest
  onap/oom/kube2msb,1.1.0
- onap/optf-has,1.1.1
- onap/optf-osdf,1.1.1
+ onap/optf-has,1.2.1-STAGING-latest
+ onap/optf-osdf,1.2.1-STAGING-latest
  onap/org.onap.dcaegen2.collectors.snmptrap,1.3.0
  onap/org.onap.dcaegen2.collectors.ves.vescollector,1.2.0
  onap/org.onap.dcaegen2.deployments.bootstrap,1.1.3
@@@ -59,7 -57,6 +59,7 @@@ onap/org.onap.dcaegen2.platform.deploym
  onap/org.onap.dcaegen2.platform.inventory-api,3.0.1
  onap/org.onap.dcaegen2.platform.policy-handler,2.4.5
  onap/org.onap.dcaegen2.platform.servicechange-handler,1.1.4
 +onap/policy-apex-pdp,2.0-SNAPSHOT-latest
  onap/policy-drools,1.3-SNAPSHOT-latest
  onap/policy-pe,1.3-SNAPSHOT-latest
  onap/portal-app,2.2.0
@@@ -84,22 -81,13 +84,22 @@@ onap/sdnc-ansible-server-image,1.4-STAG
  onap/sdnc-dmaap-listener-image,1.4-STAGING-latest
  onap/sdnc-image,1.4-STAGING-latest
  onap/sdnc-ueb-listener-image,1.4-STAGING-latest
 -onap/search-data-service,1.2.1
 +onap/search-data-service,1.2.2
  onap/sniroemulator,1.0.0
 +onap/so/api-handler-infra,1.3.0-STAGING-latest
 +onap/so/bpmn-infra,1.3.0-STAGING-latest
 +onap/so/catalog-db-adapter,1.3.0-STAGING-latest
 +onap/so/openstack-adapter,1.3.0-STAGING-latest
 +onap/so/request-db-adapter,1.3.0-STAGING-latest
 +onap/so/sdc-controller,1.3.0-STAGING-latest
 +onap/so/sdnc-adapter,1.3.0-STAGING-latest
 +onap/so/vfc-adapter,1.3.0-STAGING-latest
  onap/sparky-be,1.2.1
 -onap/testsuite,1.3.0-STAGING-latest
 +onap/testsuite,1.3.1-STAGING-latest
  onap/usecase-ui,1.1.1
  onap/usecase-ui/usecase-ui-server,1.1.1
  onap/vfc/catalog,1.1.0
 +onap/vfc/db,1.1.0-STAGING-latest
  onap/vfc/emsdriver,1.1.0
  onap/vfc/gvnfmdriver,1.1.0
  onap/vfc/jujudriver,1.1.0
@@@ -116,8 -104,9 +116,8 @@@ onap/vfc/wfengine-activiti,1.1.
  onap/vfc/wfengine-mgrservice,1.1.0
  onap/vfc/ztesdncdriver,1.1.0
  onap/vfc/ztevnfmdriver,1.1.0
 -onap/vid,2.0.0
 +onap/vid,3.0-STAGING-latest
  onap/vnfsdk/ice,1.1.0
  onap/vnfsdk/refrepo,1.1.1
  onap/vnfsdk/refrepo/postgres,1.1.1
  onap/vnfsdk/vnftest,1.1.0
 -openecomp/mso,1.2.2