Use centralised java.version variable

Seem to affect all the other places - so far - that need java version.