Update to jdk1.7