maven cleanup and upgrades
cleanup work and maven upgrades
maven upgrade
cleanup work
re-introducing groovy