Update to jdk7