Removed hardcoded reference to JDK7