Updating so that Java 7 and 8 can be selected independently with a default set