From: Gary Wu <gary.i.wu@huawei.com>
Date: Thu, 2 May 2019 14:37:04 +0000 (+0000)
Subject: Merge "Unit test instability fix"
X-Git-Tag: 4.0.0-ONAP~134
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=12750c04bc340ac2e4cf4497bc31323f9d1811e7;hp=8700ab0c505067ac00fe00714d3fdfd2b23d676e;p=integration.git

Merge "Unit test instability fix"
---

diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv
index 556f66bff..d26c39ef2 100644
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@ -96,7 +96,7 @@ onap/org.onap.dcaegen2.platform.policy-handler,5.0.0-STAGING-latest
 onap/org.onap.dcaegen2.platform.servicechange-handler,1.1.5
 onap/org.onap.dcaegen2.services.heartbeat,latest
 onap/org.onap.dcaegen2.services.pm-mapper,latest
-onap/org.onap.dcaegen2.services.prh.prh-app-server,1.2.1-SNAPSHOT
+onap/org.onap.dcaegen2.services.prh.prh-app-server,1.2.2
 onap/policy-apex-pdp,2.1-SNAPSHOT-latest
 onap/policy-distribution,2.1.0-SNAPSHOT-latest
 onap/policy-pdpd-cl,1.4-SNAPSHOT-latest
diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv
index 22cce4e27..7dd727f30 100644
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@ -101,18 +101,18 @@ 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-api-tests,1.3.4
-onap/sdc-backend,1.3.4
-onap/sdc-backend-init,1.3.4
-onap/sdc-cassandra,1.3.4
-onap/sdc-cassandra-init,1.3.4
-onap/sdc-elasticsearch,1.3.4
-onap/sdc-frontend,1.3.4
-onap/sdc-init-elasticsearch,1.3.4
-onap/sdc-kibana,1.3.4
-onap/sdc-onboard-backend,1.3.4
-onap/sdc-onboard-cassandra-init,1.3.4
-onap/sdc-ui-tests,1.3.4
+onap/sdc-api-tests,1.4.0
+onap/sdc-backend,1.4.0
+onap/sdc-backend-init,1.4.0
+onap/sdc-cassandra,1.4.0
+onap/sdc-cassandra-init,1.4.0
+onap/sdc-elasticsearch,1.4.0
+onap/sdc-frontend,1.4.0
+onap/sdc-init-elasticsearch,1.4.0
+onap/sdc-kibana,1.4.0
+onap/sdc-onboard-backend,1.4.0
+onap/sdc-onboard-cassandra-init,1.4.0
+onap/sdc-ui-tests,1.4.0
 onap/sdnc-ansible-server-image,1.4.3
 onap/sdnc-dmaap-listener-image,1.4.3
 onap/sdnc-image,1.4.3
diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv
index b026ec33e..d43159af2 100644
--- a/version-manifest/src/main/resources/java-manifest.csv
+++ b/version-manifest/src/main/resources/java-manifest.csv
@@ -239,10 +239,10 @@ org.onap.portal.sdk,epsdk-app-overlay,2.4.0
 org.onap.portal.sdk,epsdk-core,2.4.0
 org.onap.portal.sdk,epsdk-fw,2.4.0
 org.onap.portal.sdk,epsdk-workflow,2.4.0
-org.onap.sdc.jtosca,jtosca,1.4.5
+org.onap.sdc.jtosca,jtosca,1.5.1
 org.onap.sdc.sdc-distribution-client,sdc-distribution-client,1.3.0
 org.onap.sdc.sdc-titan-cassandra,sdc-titan-cassandra,1.2.0
-org.onap.sdc.sdc-tosca,sdc-tosca,1.4.6
+org.onap.sdc.sdc-tosca,sdc-tosca,1.5.1
 org.onap.sdnc.northbound,generic-resource-api.provider,1.5.0
 org.onap.sdnc.northbound,vnfapi-provider,1.5.0
 org.onap.sdnc.northbound,vnftools-provider,1.5.0