fix version numbers in type files

Change-Id: I022e922737d4ee1ed96b34e025e690f45fe1400e
Signed-off-by: Hansen, Tony (th1395) <th1395@att.com>
Issue-ID: DCAEGEN2-2207

diff --git a/makefile b/makefile
index 7071d5e..6219405 100644 (file)
--- a/makefile
+++ b/makefile
@@ -2,8 +2,10 @@ none:
        @echo make verify-versions
 
 verify-versions:
+       @echo check pom.xml against setup.py and types.yaml files
        @for i in */pom.xml; do \
                p=$$(dirname $$i); \
+               echo Working on $$i; \
                v=$$(grep "<version>" $$i | sed 2q | tail -n 1 | sed -e 's!</\?version>!!g' -e 's/-SNAPSHOT//' -e 's/[[:space:]]//g'); \
                if grep 'version[[:space:]]*=[[:space:]]*["'"']$$v['"'"]' $$p/setup.py > /dev/null; then \
                        echo "$$i version $$v verified in $$p/setup.py"; \
@@ -13,6 +15,18 @@ verify-versions:
                        echo "$$i version $$v not found in $$p/setup.py. Instead found the above version."; \
                        exit 1 ; \
                fi; \
+               if [ -f "$$p"/*types.yaml ]; then \
+                       if grep "package_version:[[:space:]]*$$v" "$$p"/*types.yaml > /dev/null 2>&1; then \
+                               echo "$$i version $$v verified in" "$$p"/*types.yaml; \
+                       else \
+                               grep -n "<version>" $$i /dev/null | sed 2q | tail -n 1; \
+                               grep -n "package_version:" "$$p"/*types.yaml /dev/null; \
+                               exit 1 ; \
+                       fi; \
+               else \
+                       echo "No types file found in $$p"; \
+               fi; \
+               echo; \
        done
        @pomv=$$(grep "<version>" pom.xml | sed 2q | tail -n 1 | sed -e 's!</\?version>!!g' -e 's/[[:space:]]//g'); \
        for i in */pom.xml; do \

diff --git a/pgaas/pgaas_types.yaml b/pgaas/pgaas_types.yaml
index 951fbd5..a81d3f6 100644 (file)
--- a/pgaas/pgaas_types.yaml
+++ b/pgaas/pgaas_types.yaml
@@ -5,7 +5,7 @@ plugins:
   pgaas:
     executor: central_deployment_agent
     package_name: pgaas
-    package_version: 1.2.0
+    package_version: 1.3.0
 
 node_types:
   dcae.nodes.pgaas.cluster:

diff --git a/sshkeyshare/sshkey_types.yaml b/sshkeyshare/sshkey_types.yaml
index 565ab1e..083fc72 100644 (file)
--- a/sshkeyshare/sshkey_types.yaml
+++ b/sshkeyshare/sshkey_types.yaml
@@ -6,7 +6,7 @@ plugins:
   ssh_keyshare:
     executor: central_deployment_agent
     package_name: sshkeyshare
-    package_version: 1.1.0
+    package_version: 1.2.0
 node_types:
   dcaegen2.nodes.ssh.keypair:
     derived_from: cloudify.nodes.Root