added oracle jdk6, update jdk7