@Tom What if we included https://github.com/jenkinsci/lib-access-modifier/ after 3.0 so that we'd get tooling for enforcing annotation checks right away? I guess it can be shaded with the only dep. For 3.0 I am just adding a quick annotation that can be later replaced