Change to jdk7+