adjust for java 7 and new ant