Update to JDK 1.7