Upgrade to jdk7