Language level fixes

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