Merge pull request #1211 from jamezp/cleanup

Cleanup of pom files to use dependency management and dependency plug…