rework code after MNG-5720 discussion

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