https://github.com/pantsbuild/pants/pull/11089 is the release prep PR, w/ those above deprecations folded in