Moved JDK 6 --> 7