Merge "r4 version updates"

diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv
index 523c30c..f4d00be 100644 (file)
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@ -71,8 +71,8 @@ onap/optf-cmso-dbinit,1.0.1
 onap/optf-cmso-service,1.0.1
 onap/optf-has,1.2.5
 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.datafile.datafile-app-server,1.1.1
+onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main,1.1.0-SNAPSHOT
 onap/org.onap.dcaegen2.collectors.snmptrap,1.4.0
 onap/org.onap.dcaegen2.collectors.ves.vescollector,1.3.1
 onap/org.onap.dcaegen2.deployments.bootstrap,1.1.3
@@ -84,9 +84,9 @@ onap/org.onap.dcaegen2.deployments.tca-cdap-container,1.1.0
 onap/org.onap.dcaegen2.deployments.tls-init-container,1.0.0
 onap/org.onap.dcaegen2.platform.cdapbroker,4.1.0
 onap/org.onap.dcaegen2.platform.configbinding.app-app,2.2.3
-onap/org.onap.dcaegen2.platform.deployment-handler,3.0.3
+onap/org.onap.dcaegen2.platform.deployment-handler,3.1.0
 onap/org.onap.dcaegen2.platform.inventory-api,3.0.4
-onap/org.onap.dcaegen2.platform.policy-handler,4.4.0
+onap/org.onap.dcaegen2.platform.policy-handler,4.5.0
 onap/org.onap.dcaegen2.platform.servicechange-handler,1.1.5
 onap/org.onap.dcaegen2.services.prh.prh-app-server,1.1.1
 onap/policy-apex-pdp,2.1-SNAPSHOT-latest

diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv
index e8f2828..abe9612 100644 (file)
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@ -71,8 +71,8 @@ onap/optf-cmso-dbinit,1.0.1
 onap/optf-cmso-service,1.0.1
 onap/optf-has,1.2.5
 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.datafile.datafile-app-server,1.0.5
+onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main,1.0.2
 onap/org.onap.dcaegen2.collectors.snmptrap,1.4.0
 onap/org.onap.dcaegen2.collectors.ves.vescollector,1.3.1
 onap/org.onap.dcaegen2.deployments.bootstrap,1.1.3

diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv
index a7765d2..b526857 100644 (file)
--- a/version-manifest/src/main/resources/java-manifest.csv
+++ b/version-manifest/src/main/resources/java-manifest.csv
@@ -179,15 +179,15 @@ org.onap.dcaegen2.analytics.tca,dcae-analytics-it,2.2.0
 org.onap.dcaegen2.analytics.tca,dcae-analytics-model,2.2.0
 org.onap.dcaegen2.analytics.tca,dcae-analytics-tca,2.2.0
 org.onap.dcaegen2.analytics.tca,dcae-analytics-test,2.2.0
-org.onap.dcaegen2.collectors,datafile,1.0.3
-org.onap.dcaegen2.collectors.datafile,datafile-app-server,1.0.3
-org.onap.dcaegen2.collectors.datafile,datafile-commons,1.0.3
-org.onap.dcaegen2.collectors.datafile,datafile-dmaap-client,1.0.3
-org.onap.dcaegen2.collectors.hv-ves,hv-collector-domain,1.0.0
-org.onap.dcaegen2.collectors.hv-ves,hv-collector-health-check,1.0.0
-org.onap.dcaegen2.collectors.hv-ves,hv-collector-main,1.0.0
-org.onap.dcaegen2.collectors.hv-ves,hv-collector-utils,1.0.0
-org.onap.dcaegen2.collectors.hv-ves,ves-hv-collector,1.0.0
+org.onap.dcaegen2.collectors,datafile,1.1.1
+org.onap.dcaegen2.collectors.datafile,datafile-app-server,1.1.1
+org.onap.dcaegen2.collectors.datafile,datafile-commons,1.1.1
+org.onap.dcaegen2.collectors.datafile,datafile-dmaap-client,1.1.1
+org.onap.dcaegen2.collectors.hv-ves,hv-collector-domain,1.1.0
+org.onap.dcaegen2.collectors.hv-ves,hv-collector-health-check,1.1.0
+org.onap.dcaegen2.collectors.hv-ves,hv-collector-main,1.1.0
+org.onap.dcaegen2.collectors.hv-ves,hv-collector-utils,1.1.0
+org.onap.dcaegen2.collectors.hv-ves,ves-hv-collector,1.1.0
 org.onap.dcaegen2.collectors.ves,VESCollector,1.3.1
 org.onap.dcaegen2.platform,inventory-api,1.0.0
 org.onap.dcaegen2.platform,servicechange-handler,1.0.0