update poms to 6.x and switch order of checks in deploy.sh