Move to the JDK 1.7