Fixing java and java jar builds