Move JDK out of build