Upgrade JavaWriter to 2.5.0