code simplification

git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1595666 13f79535-47bb-0310-9956-ffa450edef68
misc enhancements

git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1595674 13f79535-47bb-0310-9956-ffa450edef68