Code cleanups
Switch to newer resource plugin
Code cleanups, plugin version updates, converted javadoc params to
annotations and fixed javadoc errors