generic java 1.7 updates