Update to new okapi-ant