Merge "Update vfc artifact and docker version"

diff --cc version-manifest/src/main/resources/docker-manifest-staging.csv
index 0eaf5ab,96452c2..284e351
--- 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
@@@ -132,28 -132,28 +132,28 @@@ onap/tproxy-config,2.1-STAGING-lates
  onap/usecase-ui,1.1.1
  onap/usecase-ui/usecase-ui-server,1.1.1
  onap/validation,1.3-STAGING-latest
- 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
- onap/vfc/multivimproxy,1.0.0
- onap/vfc/nfvo/svnfm/huawei,1.1.0
- onap/vfc/nfvo/svnfm/nokia,1.1.0
- onap/vfc/nfvo/svnfm/nokiav2,1.1.0
- onap/vfc/nslcm,1.1.0
- onap/vfc/resmanagement,1.1.0
- onap/vfc/vnflcm,1.1.0
- onap/vfc/vnfmgr,1.1.0
- onap/vfc/vnfres,1.1.0
- onap/vfc/wfengine-activiti,1.1.0
- onap/vfc/wfengine-mgrservice,1.1.0
- onap/vfc/ztesdncdriver,1.1.0
- onap/vfc/ztevnfmdriver,1.1.0
+ onap/vfc/catalog,1.2.0-STAGING-latest
+ onap/vfc/db,1.2.0-STAGING-latest
+ onap/vfc/emsdriver,1.2.0-STAGING-latest
+ onap/vfc/gvnfmdriver,1.2.0-STAGING-latest
+ onap/vfc/jujudriver,1.2.0-STAGING-latest
+ onap/vfc/multivimproxy,1.2.0-STAGING-latest
+ onap/vfc/nfvo/svnfm/huawei,1.2.0-STAGING-latest
+ onap/vfc/nfvo/svnfm/nokia,1.1.0-STAGING-latest
+ onap/vfc/nfvo/svnfm/nokiav2,1.2.0-STAGING-latest
+ onap/vfc/nslcm,1.2.0-STAGING-latest
+ onap/vfc/resmanagement,1.2.0-STAGING-latest
+ onap/vfc/vnflcm,1.2.0-STAGING-latest
+ onap/vfc/vnfmgr,1.2.0-STAGING-latest
+ onap/vfc/vnfres,1.2.0-STAGING-latest
+ onap/vfc/wfengine-activiti,1.2.0-STAGING-latest
+ 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.0-STAGING-latest
  onap/vnfsdk/ice,1.1.0
 -onap/vnfsdk/refrepo,1.1.1
 -onap/vnfsdk/refrepo/postgres,1.1.1
 +onap/vnfsdk/refrepo,1.2.0
 +onap/vnfsdk/refrepo/postgres,1.2.0
  onap/vnfsdk/vnftest,1.1.0
  onap/vvp/cms,1.0.0
  onap/vvp/engagementmgr,1.0.0

diff --cc version-manifest/src/main/resources/docker-manifest.csv
index 5396155,b0bfa71..e1a7086
--- 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
@@@ -113,27 -113,29 +113,29 @@@ onap/sparky-be,1.3.
  onap/usecase-ui,1.1.1
  onap/usecase-ui/usecase-ui-server,1.1.1
  onap/validation,1.3.0
- onap/vfc/catalog,1.1.0
- onap/vfc/emsdriver,1.1.0
- onap/vfc/gvnfmdriver,1.1.0
- onap/vfc/jujudriver,1.1.0
- onap/vfc/multivimproxy,1.0.0
- onap/vfc/nfvo/svnfm/huawei,1.1.0
+ onap/vfc/catalog,1.2.0
+ onap/vfc/db,1.2.0
+ onap/vfc/emsdriver,1.2.0
+ onap/vfc/gvnfmdriver,1.2.0
+ onap/vfc/jujudriver,1.2.0
+ onap/vfc/multivimproxy,1.2.0
+ onap/vfc/nfvo/svnfm/huawei,1.2.0
  onap/vfc/nfvo/svnfm/nokia,1.1.0
- onap/vfc/nfvo/svnfm/nokiav2,1.1.0
- onap/vfc/nslcm,1.1.0
- onap/vfc/resmanagement,1.1.0
- onap/vfc/vnflcm,1.1.0
- onap/vfc/vnfmgr,1.1.0
- onap/vfc/vnfres,1.1.0
- onap/vfc/wfengine-activiti,1.1.0
- onap/vfc/wfengine-mgrservice,1.1.0
- onap/vfc/ztesdncdriver,1.1.0
- onap/vfc/ztevnfmdriver,1.1.0
+ onap/vfc/nfvo/svnfm/nokiav2,1.2.0
+ onap/vfc/nslcm,1.2.0
+ onap/vfc/resmanagement,1.2.0
+ onap/vfc/vnflcm,1.2.0
+ onap/vfc/vnfmgr,1.2.0
+ onap/vfc/vnfres,1.2.0
+ onap/vfc/wfengine-activiti,1.2.0
+ onap/vfc/wfengine-mgrservice,1.2.0
+ onap/vfc/ztesdncdriver,1.2.0
+ onap/vfc/ztevnfmdriver,1.2.0
+ onap/vfc/ztevnfmdriver,1.2.0
  onap/vid,3.0.0
  onap/vnfsdk/ice,1.1.0
 -onap/vnfsdk/refrepo,1.1.1
 -onap/vnfsdk/refrepo/postgres,1.1.1
 +onap/vnfsdk/refrepo,1.2.0
 +onap/vnfsdk/refrepo/postgres,1.2.0
  onap/vnfsdk/vnftest,1.1.0
  onap/vvp/cms,1.0.0
  onap/vvp/engagementmgr,1.0.0

diff --cc version-manifest/src/main/resources/java-manifest.csv
index 0b7b356,03939cc..e96f1d4
--- 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
@@@ -244,30 -244,31 +244,31 @@@ org.onap.sdnc.northbound,vnfapi-provide
  org.onap.sdnc.northbound,vnftools-provider,1.4.0
  org.onap.usecase-ui,usecaseui-common,1.1.0
  org.onap.usecase-ui.server,usecase-ui-server,1.1.0
- org.onap.vfc.gvnfm.vnflcm.lcm,vfc-gvnfm-vnflcm-lcm,1.1.0
- org.onap.vfc.gvnfm.vnfmgr.mgr,vfc-gvnfm-vnfmgr-mgr,1.1.0
- org.onap.vfc.gvnfm.vnfres.res,vfc-gvnfm-vnfres-res,1.1.0
- org.onap.vfc.nfvo.catalog,vfc-nfvo-catalog,1.1.0
- org.onap.vfc.nfvo.driver.ems.ems,emsdriver-standalone,1.1.0
- org.onap.vfc.nfvo.driver.sfc.zte.sfc-driver-standalone,vfc-nfvo-driver-sfc-zte-sfc-driver,1.1.0
- org.onap.vfc.nfvo.driver.vnfm.gvnfm.gvnfmadapter,vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter,1.1.0
+ org.onap.vfc.gvnfm.vnflcm.lcm,vfc-gvnfm-vnflcm-lcm,1.2.0
+ org.onap.vfc.gvnfm.vnfmgr.mgr,vfc-gvnfm-vnfmgr-mgr,1.2.0
+ org.onap.vfc.gvnfm.vnfres.res,vfc-gvnfm-vnfres-res,1.2.0
+ org.onap.vfc.nfvo.catalog,vfc-nfvo-catalog,1.2.0
+ org.onap.vfc.nfvo.db,vfc-nfvo-db,1.2.0
+ org.onap.vfc.nfvo.driver.ems.ems,emsdriver-standalone,1.2.0
+ org.onap.vfc.nfvo.driver.sfc.zte.sfc-driver-standalone,vfc-nfvo-driver-sfc-zte-sfc-driver,1.2.0
+ org.onap.vfc.nfvo.driver.vnfm.gvnfm.gvnfmadapter,vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter,1.2.0
  org.onap.vfc.nfvo.driver.vnfm.svnfm,vfcadaptor-deployment,1.1.0
- org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter,hw-vnfmadapter-deployment,1.1.0
- org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2,driverwar,1.1.0
- org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager,vfc-nfvo-driver-vnfm-svnfm-zte-vmanager,1.1.0
- org.onap.vfc.nfvo.lcm,vfc-nfvo-lcm,1.1.0
- org.onap.vfc.nfvo.multivimproxy,vfc-nfvo-multivimproxy-deployment,1.0.0
- org.onap.vfc.nfvo.resmanagement,vfc-nfvo-resmanagement-deployment,1.1.0
- org.onap.vfc.nfvo.wfengine,activiti-extension,1.1.0
- org.onap.vfc.nfvo.wfengine,workflow-engine-mgr-service,1.1.0
+ org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter,hw-vnfmadapter-deployment,1.2.0
+ org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2,driverwar,1.2.0
+ org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager,vfc-nfvo-driver-vnfm-svnfm-zte-vmanager,1.2.0
+ org.onap.vfc.nfvo.lcm,vfc-nfvo-lcm,1.2.0
+ org.onap.vfc.nfvo.multivimproxy,vfc-nfvo-multivimproxy-deployment,1.2.0
+ org.onap.vfc.nfvo.resmanagement,vfc-nfvo-resmanagement-deployment,1.2.0
+ org.onap.vfc.nfvo.wfengine,activiti-extension,1.2.0
+ org.onap.vfc.nfvo.wfengine,workflow-engine-mgr-service,1.2.0
  org.onap.vnfsdk.refrepo,vnf-sdk-marketplace,1.1.2
 -org.onap.vnfsdk.refrepo,vnf-sdk-marketplace-core-parent,1.1.1
 -org.onap.vnfsdk.refrepo,vnf-sdk-marketplace-deployment,1.1.2
 -org.onap.vnfsdk.refrepo,vnfmarket,1.1.1
 -org.onap.vnfsdk.refrepo,vnfmarket-deployment,1.1.2
 -org.onap.vnfsdk.validation,csarvalidation-deployment,1.1.1
 -org.onap.vnfsdk.validation,validation,1.1.2
 -org.onap.vnfsdk.validation,validation-csar,1.1.2
 +org.onap.vnfsdk.refrepo,vnf-sdk-marketplace-core-parent,1.2.0
 +org.onap.vnfsdk.refrepo,vnf-sdk-marketplace-deployment,1.2.0
 +org.onap.vnfsdk.refrepo,vnfmarket,1.2.0
 +org.onap.vnfsdk.refrepo,vnfmarket-deployment,1.2.0
 +org.onap.vnfsdk.validation,csarvalidation-deployment,1.1.3
 +org.onap.vnfsdk.validation,validation,1.1.3
 +org.onap.vnfsdk.validation,validation-csar,1.1.3
  org.onap.vnfsdk.ves-agent,evel_javalib2,1.1.0
  org.openecomp.so,MSOCommonBPMN,1.2.2
  org.openecomp.so,MSOCoreBPMN,1.2.2