Maven fixes moving to java 7