Switch to JDK7