Merge "Version bump testsuite release image"

diff --git a/version-manifest/pom.xml b/version-manifest/pom.xml
index 48dd9c1..ab55b5c 100644 (file)
--- a/version-manifest/pom.xml
+++ b/version-manifest/pom.xml
@@ -8,7 +8,7 @@
   </parent>
   <groupId>org.onap.integration</groupId>
   <artifactId>version-manifest</artifactId>
-  <version>3.0.0-SNAPSHOT</version>
+  <version>4.0.0-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
   <name>ONAP Version Manifest and Maven Plugin</name>
   <url>https://www.onap.org</url>

diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv
index b8004af..ebef6e5 100644 (file)
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@ -135,24 +135,24 @@ onap/tproxy-config,2.1-STAGING-latest
 onap/usecase-ui,1.2.2-STAGING-latest
 onap/usecase-ui-server,1.2.1-STAGING-latest
 onap/validation,1.3-STAGING-latest
-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/catalog,1.2.1-STAGING-latest
+onap/vfc/db,1.2.1-STAGING-latest
+onap/vfc/emsdriver,1.2.1-STAGING-latest
+onap/vfc/gvnfmdriver,1.2.1-STAGING-latest
+onap/vfc/jujudriver,1.2.1-STAGING-latest
+onap/vfc/multivimproxy,1.2.1-STAGING-latest
+onap/vfc/nfvo/svnfm/huawei,1.2.1-STAGING-latest
 onap/vfc/nfvo/svnfm/nokia,1.1.0-STAGING-latest
-onap/vfc/nfvo/svnfm/nokiav2,1.3.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/nfvo/svnfm/nokiav2,1.2.1-STAGING-latest
+onap/vfc/nslcm,1.2.1-STAGING-latest
+onap/vfc/resmanagement,1.2.1-STAGING-latest
+onap/vfc/vnflcm,1.2.1-STAGING-latest
+onap/vfc/vnfmgr,1.2.1-STAGING-latest
+onap/vfc/vnfres,1.2.1-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/vfc/ztevnfmdriver,1.2.1-STAGING-latest
 onap/vid,3.2.0
 onap/vnfsdk/ice,1.1.0
 onap/vnfsdk/refrepo,1.2.0

diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv
index 43d0c9e..8aaa7a8 100644 (file)
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@ -124,24 +124,24 @@ onap/testsuite,1.3.1
 onap/usecase-ui,1.2.2
 onap/usecase-ui-server,1.2.1
 onap/validation,1.3.1
-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/catalog,1.2.1
+onap/vfc/db,1.2.1
+onap/vfc/emsdriver,1.2.1
+onap/vfc/gvnfmdriver,1.2.1
+onap/vfc/jujudriver,1.2.1
+onap/vfc/multivimproxy,1.2.1
+onap/vfc/nfvo/svnfm/huawei,1.2.1
 onap/vfc/nfvo/svnfm/nokia,1.1.0
-onap/vfc/nfvo/svnfm/nokiav2,1.3.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/nfvo/svnfm/nokiav2,1.2.1
+onap/vfc/nslcm,1.2.1
+onap/vfc/resmanagement,1.2.1
+onap/vfc/vnflcm,1.2.1
+onap/vfc/vnfmgr,1.2.1
+onap/vfc/vnfres,1.2.1
 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.1
 onap/vid,3.2.0
 onap/vnfsdk/ice,1.1.0
 onap/vnfsdk/refrepo,1.2.0

diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv
index 5977b89..5ed838b 100644 (file)
--- a/version-manifest/src/main/resources/java-manifest.csv
+++ b/version-manifest/src/main/resources/java-manifest.csv
@@ -246,23 +246,22 @@ org.onap.sdnc.northbound,generic-resource-api.provider,1.4.1
 org.onap.sdnc.northbound,vnfapi-provider,1.4.1
 org.onap.sdnc.northbound,vnftools-provider,1.4.1
 org.onap.usecase-ui.server,usecase-ui-server,1.2.1
-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.gvnfm.vnflcm.lcm,vfc-gvnfm-vnflcm-lcm,1.2.1
+org.onap.vfc.gvnfm.vnfmgr.mgr,vfc-gvnfm-vnfmgr-mgr,1.2.1
+org.onap.vfc.gvnfm.vnfres.res,vfc-gvnfm-vnfres-res,1.2.1
+org.onap.vfc.nfvo.catalog,vfc-nfvo-catalog,1.2.1
+org.onap.vfc.nfvo.db,vfc-nfvo-db,1.2.1
+org.onap.vfc.nfvo.driver.ems.ems,emsdriver-standalone,1.2.1
 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.gvnfm.gvnfmadapter,vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter,1.2.1
 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.2.0
-org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2,driverwar,1.3.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.driver.vnfm.svnfm.huawei.vnfmadapter,hw-vnfmadapter-deployment,1.2.1
+org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2,driverwar,1.2.1
+org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager,vfc-nfvo-driver-vnfm-svnfm-zte-vmanager,1.2.1
+org.onap.vfc.nfvo.lcm,vfc-nfvo-lcm,1.2.1
+org.onap.vfc.nfvo.multivimproxy,vfc-nfvo-multivimproxy-deployment,1.2.1
+org.onap.vfc.nfvo.resmanagement,vfc-nfvo-resmanagement-deployment,1.2.1
 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.2.0
 org.onap.vnfsdk.refrepo,vnf-sdk-marketplace-deployment,1.2.0

diff --git a/version.properties b/version.properties
index ddc6dd8..50547ff 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -3,7 +3,7 @@
 # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
 # because they are used in Jenkins, whose plug-in doesn't support
 
-major_version=3
+major_version=4
 minor_version=0
 patch_version=0