Switching to JDK version 7