Merge "Script to upgrade oparent in all projects"
diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv
index 92dd4bb..e6eedbc 100644
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@ -1,11 +1,11 @@
image,tag
-onap/aaf/aaf_cm,2.1.1
-onap/aaf/aaf_fs,2.1.1
-onap/aaf/aaf_gui,2.1.1
-onap/aaf/aaf_hello,2.1.1
-onap/aaf/aaf_locate,2.1.1
-onap/aaf/aaf_oauth,2.1.1
-onap/aaf/aaf_service,2.1.1
+onap/aaf/aaf_cm,2.1.2-SNAPSHOT
+onap/aaf/aaf_fs,2.1.2-SNAPSHOT
+onap/aaf/aaf_gui,2.1.2-SNAPSHOT
+onap/aaf/aaf_hello,2.1.2-SNAPSHOT
+onap/aaf/aaf_locate,2.1.2-SNAPSHOT
+onap/aaf/aaf_oauth,2.1.2-SNAPSHOT
+onap/aaf/aaf_service,2.1.2-SNAPSHOT
onap/aaf/sms,2.0.0
onap/aaf/smsquorumclient,2.0.0
onap/aai-resources,1.2.2
@@ -27,8 +27,8 @@
onap/dmaap/dmaap-mr,1.1.5
onap/externalapi/nbi,2.0.0
onap/gizmo,1.2.1
-onap/holmes/engine-management,1.1.0
-onap/holmes/rule-management,1.1.0
+onap/holmes/engine-management,1.2.0-STAGING-latest
+onap/holmes/rule-management,1.2.0-STAGING-latest
onap/model-loader,1.2.1
onap/msb/msb_apigateway,1.2.0-STAGING-latest
onap/msb/msb_discovery,1.2.0-STAGING-latest
@@ -115,7 +115,7 @@
onap/vfc/wfengine-mgrservice,1.1.0
onap/vfc/ztesdncdriver,1.1.0
onap/vfc/ztevnfmdriver,1.1.0
-onap/vid,2.0.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
diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv
index 5393b80..64d78a6 100644
--- a/version-manifest/src/main/resources/java-manifest.csv
+++ b/version-manifest/src/main/resources/java-manifest.csv
@@ -1,28 +1,28 @@
groupId,artifactId,version
-org.onap.aaf.authz,aaf-auth-batch,2.1.1
-org.onap.aaf.authz,aaf-auth-cass,2.1.1
-org.onap.aaf.authz,aaf-auth-certman,2.1.1
-org.onap.aaf.authz,aaf-auth-client,2.1.1
-org.onap.aaf.authz,aaf-auth-cmd,2.1.1
-org.onap.aaf.authz,aaf-auth-core,2.1.1
-org.onap.aaf.authz,aaf-auth-deforg,2.1.1
-org.onap.aaf.authz,aaf-auth-fs,2.1.1
-org.onap.aaf.authz,aaf-auth-gui,2.1.1
-org.onap.aaf.authz,aaf-auth-hello,2.1.1
-org.onap.aaf.authz,aaf-auth-locate,2.1.1
-org.onap.aaf.authz,aaf-auth-oauth,2.1.1
-org.onap.aaf.authz,aaf-auth-service,2.1.1
-org.onap.aaf.authz,aaf-cadi-aaf,2.1.1
-org.onap.aaf.authz,aaf-cadi-cass,2.1.1
-org.onap.aaf.authz,aaf-cadi-client,2.1.1
-org.onap.aaf.authz,aaf-cadi-core,2.1.1
-org.onap.aaf.authz,aaf-cadi-oauth-enduser,2.1.1
-org.onap.aaf.authz,aaf-cadi-shiro,2.1.1
-org.onap.aaf.authz,aaf-misc-env,2.1.1
-org.onap.aaf.authz,aaf-misc-log4j,2.1.1
-org.onap.aaf.authz,aaf-misc-rosetta,2.1.1
-org.onap.aaf.authz,aaf-misc-xgen,2.1.1
-org.onap.aaf.authz,aaf-shiro-aafrealm-osgi-bundle,2.1.1
+org.onap.aaf.authz,aaf-auth-batch,2.1.2-SNAPSHOT
+org.onap.aaf.authz,aaf-auth-cass,2.1.2-SNAPSHOT
+org.onap.aaf.authz,aaf-auth-certman,2.1.2-SNAPSHOT
+org.onap.aaf.authz,aaf-auth-client,2.1.2-SNAPSHOT
+org.onap.aaf.authz,aaf-auth-cmd,2.1.2-SNAPSHOT
+org.onap.aaf.authz,aaf-auth-core,2.1.2-SNAPSHOT
+org.onap.aaf.authz,aaf-auth-deforg,2.1.2-SNAPSHOT
+org.onap.aaf.authz,aaf-auth-fs,2.1.2-SNAPSHOT
+org.onap.aaf.authz,aaf-auth-gui,2.1.2-SNAPSHOT
+org.onap.aaf.authz,aaf-auth-hello,2.1.2-SNAPSHOT
+org.onap.aaf.authz,aaf-auth-locate,2.1.2-SNAPSHOT
+org.onap.aaf.authz,aaf-auth-oauth,2.1.2-SNAPSHOT
+org.onap.aaf.authz,aaf-auth-service,2.1.2-SNAPSHOT
+org.onap.aaf.authz,aaf-cadi-aaf,2.1.2-SNAPSHOT
+org.onap.aaf.authz,aaf-cadi-cass,2.1.2-SNAPSHOT
+org.onap.aaf.authz,aaf-cadi-client,2.1.2-SNAPSHOT
+org.onap.aaf.authz,aaf-cadi-core,2.1.2-SNAPSHOT
+org.onap.aaf.authz,aaf-cadi-oauth-enduser,2.1.2-SNAPSHOT
+org.onap.aaf.authz,aaf-cadi-shiro,2.1.2-SNAPSHOT
+org.onap.aaf.authz,aaf-misc-env,2.1.2-SNAPSHOT
+org.onap.aaf.authz,aaf-misc-log4j,2.1.2-SNAPSHOT
+org.onap.aaf.authz,aaf-misc-rosetta,2.1.2-SNAPSHOT
+org.onap.aaf.authz,aaf-misc-xgen,2.1.2-SNAPSHOT
+org.onap.aaf.authz,aaf-shiro-aafrealm-osgi-bundle,2.1.2-SNAPSHOT
org.onap.aai,rest-client,1.2.1
org.onap.aai,search-data-service,1.2.0
org.onap.aai.aai-common,aai-annotations,1.2.4
@@ -185,10 +185,10 @@
org.onap.dmaap.messagerouter.messageservice,dmaapMR1,1.0.1
org.onap.dmaap.messagerouter.mirroragent,dmaapMMAgent,1.0.0
org.onap.dmaap.messagerouter.msgrtr,msgrtr,1.0.0
-org.onap.holmes.common,holmes-actions,1.0.0
-org.onap.holmes.dsa,dmaap-dsa,1.0.0
-org.onap.holmes.engine-management,holmes-engine-d,1.1.0
-org.onap.holmes.rule-management,holmes-rulemgt,1.1.0
+org.onap.holmes.common,holmes-actions,1.2.0-SNAPSHOT
+org.onap.holmes.dsa,dmaap-dsa,1.2.0-SNAPSHOT
+org.onap.holmes.engine-management,holmes-engine-d,1.2.0-SNAPSHOT
+org.onap.holmes.rule-management,holmes-rulemgt,1.2.0-SNAPSHOT
org.onap.modeling.toscaparsers,Checker,1.0.0
org.onap.modeling.toscaparsers,Service,1.0.0
org.onap.modeling.toscaparsers,kwalify,1.0.0