I think you're right that the sonatype step could moved back to before `setNextVersion` & `commitNextVersion` - it _is_ more convenient in the case of close-failure.