Fully update requirements to Java 7