Switch to JDK 1.7