Bump versions, got rid of JDK6