Update p-u to .18, added jsr305

git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1631837 13f79535-47bb-0310-9956-ffa450edef68
Updated annotations

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