Update Java baseline to Java 7