Fixed various java5 stuff

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

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