Merge "Updated the docker manifest to version 1.2.3"

diff --combined version-manifest/src/main/resources/docker-manifest-staging.csv
index e516df4,5668923..0ed405a
--- 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
@@@ -59,8 -59,8 +59,8 @@@ onap/music/music,2.5.
  onap/music/prom,1.0.5-latest
  onap/network-discovery,latest
  onap/oom/kube2msb,1.1.0
- onap/optf-has,1.2.2
- onap/optf-osdf,1.2.2
+ 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/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main,1.0.0
  onap/org.onap.dcaegen2.collectors.snmptrap,1.4.0
@@@ -109,15 -109,15 +109,15 @@@ onap/sdnc-ueb-listener-image,1.4-STAGIN
  onap/search-data-service,1.3-STAGING-latest
  onap/service-decomposition,latest
  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/so-monitoring,latest
 -onap/so/vfc-adapter,1.3.0-STAGING-latest
 +onap/so/api-handler-infra,1.3.1-STAGING-latest
 +onap/so/bpmn-infra,1.3.1-STAGING-latest
 +onap/so/catalog-db-adapter,1.3.1-STAGING-latest
 +onap/so/openstack-adapter,1.3.1-STAGING-latest
 +onap/so/request-db-adapter,1.3.1-STAGING-latest
 +onap/so/sdc-controller,1.3.1-STAGING-latest
 +onap/so/sdnc-adapter,1.3.1-STAGING-latest
 +onap/so/so-monitoring,1.3.1-STAGING-latest
 +onap/so/vfc-adapter,1.3.1-STAGING-latest
  onap/sparky-be,1.3-STAGING-latest
  onap/spike,1.0-STAGING-latest
  onap/testsuite,1.3.1-STAGING-latest

diff --combined version-manifest/src/main/resources/docker-manifest.csv
index e2fb54f,4d20d5c..986d386
--- 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
@@@ -55,8 -55,8 +55,8 @@@ 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.2
- onap/optf-osdf,1.2.2
+ 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/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main,1.0.0
  onap/org.onap.dcaegen2.collectors.snmptrap,1.4.0
@@@ -103,15 -103,14 +103,15 @@@ onap/sdnc-image,1.4.
  onap/sdnc-ueb-listener-image,1.4.1
  onap/search-data-service,1.3.1
  onap/sniroemulator,1.0.0
 -onap/so/api-handler-infra,1.3.0
 -onap/so/asdc-controller,1.3.0
 -onap/so/bpmn-infra,1.3.0
 -onap/so/catalog-db-adapter,1.3.0
 -onap/so/openstack-adapter,1.3.0
 -onap/so/request-db-adapter,1.3.0
 -onap/so/sdnc-adapter,1.3.0
 -onap/so/vfc-adapter,1.3.0
 +onap/so/api-handler-infra,1.3.1
 +onap/so/bpmn-infra,1.3.1
 +onap/so/catalog-db-adapter,1.3.1
 +onap/so/openstack-adapter,1.3.1
 +onap/so/request-db-adapter,1.3.1
 +onap/so/sdc-controller,1.3.1
 +onap/so/sdnc-adapter,1.3.1
 +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-server,1.2.0