Support java version detection
Update the java stuff again