Merge "Updated Docker Image Version"

diff --combined version-manifest/src/main/resources/docker-manifest-staging.csv
index 2add05d,9fe19e2..a267870
--- 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,18 -1,18 +1,18 @@@
  image,tag
 -onap/aaf/aaf_agent,2.1.6-SNAPSHOT
 -onap/aaf/aaf_cass,2.1.6-SNAPSHOT
 -onap/aaf/aaf_cm,2.1.6-SNAPSHOT
 -onap/aaf/aaf_config,2.1.6-SNAPSHOT
 -onap/aaf/aaf_fs,2.1.6-SNAPSHOT
 -onap/aaf/aaf_gui,2.1.6-SNAPSHOT
 -onap/aaf/aaf_hello,2.1.6-SNAPSHOT
 -onap/aaf/aaf_locate,2.1.6-SNAPSHOT
 -onap/aaf/aaf_oauth,2.1.6-SNAPSHOT
 -onap/aaf/aaf_service,2.1.6-SNAPSHOT
 +onap/aaf/aaf_agent,2.1.7-SNAPSHOT
 +onap/aaf/aaf_cass,2.1.7-SNAPSHOT
 +onap/aaf/aaf_cm,2.1.7-SNAPSHOT
 +onap/aaf/aaf_config,2.1.7-SNAPSHOT
 +onap/aaf/aaf_fs,2.1.7-SNAPSHOT
 +onap/aaf/aaf_gui,2.1.7-SNAPSHOT
 +onap/aaf/aaf_hello,2.1.7-SNAPSHOT
 +onap/aaf/aaf_locate,2.1.7-SNAPSHOT
 +onap/aaf/aaf_oauth,2.1.7-SNAPSHOT
 +onap/aaf/aaf_service,2.1.7-SNAPSHOT
  onap/aaf/abrmd,3.0.0-SNAPSHOT-latest
  onap/aaf/distcenter,3.0.0-SNAPSHOT-latest
 -onap/aaf/sms,3.0.0-SNAPSHOT-latest
 -onap/aaf/smsquorumclient,3.0.0-SNAPSHOT-latest
 +onap/aaf/sms,3.0.1-SNAPSHOT-latest
 +onap/aaf/smsquorumclient,3.0.1-SNAPSHOT-latest
  onap/aaf/testcaservice,3.0.0-SNAPSHOT-latest
  onap/aai-graphadmin,1.0-STAGING-latest
  onap/aai-resources,1.3-STAGING-latest
@@@ -23,8 -23,8 +23,8 @@@ onap/admportal-sdnc-image,1.4-STAGING-l
  onap/appc-cdt-image,1.4.1-SNAPSHOT-latest
  onap/appc-image,1.4.1-SNAPSHOT-latest
  onap/babel,1.3-STAGING-latest
 -onap/ccsdk-apps-ms-neng,latest
 -onap/ccsdk-controllerblueprints,latest
 +onap/ccsdk-apps-ms-neng,0.3-STAGING-latest
 +onap/ccsdk-controllerblueprints,0.3-STAGING-latest
  onap/ccsdk-dgbuilder-image,0.3-STAGING-latest
  onap/ccsdk-odl-image,0.3-STAGING-latest
  onap/ccsdk-odlsli-image,0.3-STAGING-latest
@@@ -37,13 -37,13 +37,13 @@@ onap/data-router,1.3-STAGING-lates
  onap/dmaap/buscontroller,1.0.23
  onap/dmaap/datarouter-node,latest
  onap/dmaap/datarouter-prov,latest
 -onap/dmaap/dmaap-mr,1.1.8
 +onap/dmaap/dmaap-mr,1.1.9
  onap/dmaap/kafka01101,0.0.1
  onap/externalapi/nbi,3.0.0-latest
  onap/fproxy,2.1-STAGING-latest
  onap/gizmo,1.3-STAGING-latest
  onap/holmes/engine-management,1.2.2-STAGING-latest
- onap/holmes/rule-management,1.2.2-STAGING-latest
+ onap/holmes/rule-management,1.2.3-STAGING-latest
  onap/model-loader,1.3-STAGING-latest
  onap/msb/msb_apigateway,1.2.2-STAGING-latest
  onap/msb/msb_discovery,1.2.2-STAGING-latest
@@@ -58,15 -58,13 +58,15 @@@ onap/multicloud/vio-vesagent,1.0.
  onap/music/cassandra_3_11,3.0.23
  onap/music/cassandra_job,3.0.23
  onap/music/cassandra_music,3.0.0
 -onap/music/music,2.5.3
 +onap/music/music,3.0.23
  onap/music/prom,1.0.5-latest
  onap/network-discovery,latest
  onap/oom/kube2msb,1.1.0
 -onap/optf-has,1.2.3
 -onap/optf-osdf,1.2.3
 -onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server,1.0.3
 +onap/optf-cmso-dbinit,1.0.1
 +onap/optf-cmso-service,1.0.1
 +onap/optf-has,1.2.4
 +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.snmptrap,1.4.0
  onap/org.onap.dcaegen2.collectors.ves.vescollector,1.3.1
@@@ -127,7 -125,7 +127,7 @@@ onap/sparky-be,1.3-STAGING-lates
  onap/spike,1.0-STAGING-latest
  onap/testsuite,1.3.1-STAGING-latest
  onap/tproxy-config,2.1-STAGING-latest
 -onap/usecase-ui,1.2.0-STAGING-latest
 +onap/usecase-ui,1.2.1-STAGING-latest
  onap/usecase-ui-server,1.2.0-STAGING-latest
  onap/validation,1.3-STAGING-latest
  onap/vfc/catalog,1.2.0-STAGING-latest
@@@ -148,7 -146,7 +148,7 @@@ onap/vfc/wfengine-activiti,1.2.0-STAGIN
  onap/vfc/wfengine-mgrservice,1.2.0-STAGING-latest
  onap/vfc/ztesdncdriver,1.2.0-STAGING-latest
  onap/vfc/ztevnfmdriver,1.2.0
 -onap/vid,3.1-STAGING-latest
 +onap/vid,3.2-STAGING-latest
  onap/vnfsdk/ice,1.1.0
  onap/vnfsdk/refrepo,1.2.0
  onap/vnfsdk/refrepo/postgres,1.2.0

diff --combined version-manifest/src/main/resources/docker-manifest.csv
index 1e1654a,eb69382..421161d
--- 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
@@@ -10,8 -10,8 +10,8 @@@ onap/aaf/aaf_oauth,2.1.
  onap/aaf/aaf_service,2.1.6
  onap/aaf/abrmd,3.0.0
  onap/aaf/distcenter,3.0.0
 -onap/aaf/sms,3.0.0
 -onap/aaf/smsquorumclient,3.0.0
 +onap/aaf/sms,3.0.1
 +onap/aaf/smsquorumclient,3.0.1
  onap/aaf/testcaservice,3.0.0
  onap/aai-cacher,1.0.0
  onap/aai-graphadmin,1.0.0
@@@ -19,7 -19,7 +19,7 @@@ onap/aai-resources,1.3.
  onap/aai-traversal,1.3.1
  onap/aai/esr-gui,1.2.1
  onap/aai/esr-server,1.2.1
 -onap/admportal-sdnc-image,1.3.4
 +onap/admportal-sdnc-image,1.4.1
  onap/appc-cdt-image,1.4.0
  onap/appc-image,1.4.0
  onap/babel,1.3.0
@@@ -29,20 -29,20 +29,20 @@@ onap/ccsdk-dgbuilder-image,0.3.
  onap/ccsdk-odl-oxygen-image,0.3.1
  onap/ccsdk-odlsli-image,0.3.1
  onap/champ,1.3.0
 -onap/clamp,3.0.1
 -onap/clamp-dashboard-kibana,3.0.1
 -onap/clamp-dashboard-logstash,3.0.1
 +onap/clamp,3.0.2
 +onap/clamp-dashboard-kibana,3.0.2
 +onap/clamp-dashboard-logstash,3.0.2
  onap/cli,2.0.4
  onap/data-router,1.3.0
  onap/dmaap/buscontroller,1.0.23
  onap/dmaap/datarouter-node,1.0.3
  onap/dmaap/datarouter-prov,1.0.3
 -onap/dmaap/dmaap-mr,1.1.7
 +onap/dmaap/dmaap-mr,1.1.8
  onap/dmaap/kafka01101,0.0.1
  onap/externalapi/nbi,3.0.1
  onap/gizmo,1.3.0
- onap/holmes/engine-management,1.2.1
- onap/holmes/rule-management,1.2.1
+ onap/holmes/engine-management,1.2.2
+ onap/holmes/rule-management,1.2.3
  onap/model-loader,1.3.0
  onap/msb/msb_apigateway,1.2.1
  onap/msb/msb_discovery,1.2.1
@@@ -58,10 -58,8 +58,10 @@@ onap/music/cassandra_3_11,3.0.2
  onap/music/cassandra_job,3.0.23
  onap/music/music,3.0.23
  onap/oom/kube2msb,1.1.0
 -onap/optf-has,1.2.3
 -onap/optf-osdf,1.2.3
 +onap/optf-cmso-dbinit,1.0.1
 +onap/optf-cmso-service,1.0.1
 +onap/optf-has,1.2.4
 +onap/optf-osdf,1.2.4
  onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server,1.0.3
  onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main,1.0.0
  onap/org.onap.dcaegen2.collectors.snmptrap,1.4.0
@@@ -69,7 -67,7 +69,7 @@@ onap/org.onap.dcaegen2.collectors.ves.v
  onap/org.onap.dcaegen2.deployments.bootstrap,1.1.3
  onap/org.onap.dcaegen2.deployments.cm-container,1.4.2
  onap/org.onap.dcaegen2.deployments.healthcheck-container,1.1.2
 -onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container,1.4.4
 +onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container,1.4.5
  onap/org.onap.dcaegen2.deployments.redis-cluster-container,1.0.0
  onap/org.onap.dcaegen2.deployments.tca-cdap-container,1.1.0
  onap/org.onap.dcaegen2.deployments.tls-init-container,1.0.0
@@@ -88,10 -86,10 +88,10 @@@ onap/pomba-aai-context-builder,1.3.
  onap/pomba-context-aggregator,1.3.2
  onap/pomba-network-discovery-context-builder,1.3.0
  onap/pomba-sdc-context-builder,1.3.1
 -onap/portal-app,2.3.0
 -onap/portal-db,2.3.0
 -onap/portal-sdk,2.3.0
 -onap/portal-wms,2.3.0
 +onap/portal-app,2.3.1
 +onap/portal-db,2.3.1
 +onap/portal-sdk,2.3.1
 +onap/portal-wms,2.3.1
  onap/sdc-backend,1.3.0
  onap/sdc-backend-init,1.3.0
  onap/sdc-cassandra,1.3.0
@@@ -118,7 -116,7 +118,7 @@@ onap/so/sdnc-adapter,1.3.
  onap/so/so-monitoring,1.3.1
  onap/so/vfc-adapter,1.3.1
  onap/sparky-be,1.3.0
 -onap/usecase-ui,1.2.0
 +onap/usecase-ui,1.2.1
  onap/usecase-ui-server,1.2.0
  onap/validation,1.3.0
  onap/vfc/catalog,1.2.0
@@@ -139,7 -137,7 +139,7 @@@ onap/vfc/wfengine-activiti,1.2.
  onap/vfc/wfengine-mgrservice,1.2.0
  onap/vfc/ztesdncdriver,1.2.0
  onap/vfc/ztevnfmdriver,1.2.0
 -onap/vid,3.0.0
 +onap/vid,3.2.0
  onap/vnfsdk/ice,1.1.0
  onap/vnfsdk/refrepo,1.2.0
  onap/vnfsdk/refrepo/postgres,1.2.0