move to java 1.7