Bumped to Java 7