upgrade to Java7