diff --git a/versioned_docs/version-2.21/reference/help-all.json b/versioned_docs/version-2.21/reference/help-all.json
index 394d7031..b3514e8e 100644
--- a/versioned_docs/version-2.21/reference/help-all.json
+++ b/versioned_docs/version-2.21/reference/help-all.json
@@ -11007,7 +11007,7 @@
       ],
       "env_var": "PANTS_GOOGLE_JAVA_FORMAT_LOCKFILE",
       "fromfile": false,
-      "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/java/lint/google_java_format/google_java_format.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=google-java-format`.",
+      "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/java/lint/google_java_format/google_java_format.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=google-java-format`.",
       "removal_hint": null,
       "removal_version": null,
       "scoped_cmd_line_args": [
@@ -14349,7 +14349,7 @@
       ],
       "env_var": "PANTS_JARJAR_LOCKFILE",
       "fromfile": false,
-      "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/jvm/shading/jarjar.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=jarjar`.",
+      "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/jvm/shading/jarjar.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=jarjar`.",
       "removal_hint": null,
       "removal_version": null,
       "scoped_cmd_line_args": [
@@ -14669,7 +14669,7 @@
       ],
       "env_var": "PANTS_JAVA_AVRO_LOCKFILE",
       "fromfile": false,
-      "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/codegen/avro/java/avro-tools.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=java-avro`.",
+      "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/codegen/avro/java/avro-tools.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=java-avro`.",
       "removal_hint": null,
       "removal_version": null,
       "scoped_cmd_line_args": [
@@ -15033,7 +15033,7 @@
       ],
       "env_var": "PANTS_JUNIT_LOCKFILE",
       "fromfile": false,
-      "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/jvm/test/junit.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=junit`.",
+      "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/jvm/test/junit.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=junit`.",
       "removal_hint": null,
       "removal_version": null,
       "scoped_cmd_line_args": [
@@ -15835,7 +15835,7 @@
       ],
       "env_var": "PANTS_KTLINT_LOCKFILE",
       "fromfile": false,
-      "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/kotlin/lint/ktlint/ktlint.lock for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=ktlint`.",
+      "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/kotlin/lint/ktlint/ktlint.lock for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=ktlint`.",
       "removal_hint": null,
       "removal_version": null,
       "scoped_cmd_line_args": [
@@ -18605,7 +18605,7 @@
       ],
       "env_var": "PANTS_OPENAPI_GENERATOR_LOCKFILE",
       "fromfile": false,
-      "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/openapi/subsystems/openapi_generator.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=openapi-generator`.",
+      "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/openapi/subsystems/openapi_generator.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=openapi-generator`.",
       "removal_hint": null,
       "removal_version": null,
       "scoped_cmd_line_args": [
@@ -20499,7 +20499,7 @@
       ],
       "env_var": "PANTS_PROTOBUF_JAVA_GRPC_LOCKFILE",
       "fromfile": false,
-      "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/codegen/protobuf/java/grpc-java.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=protobuf-java-grpc`.",
+      "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/codegen/protobuf/java/grpc-java.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=protobuf-java-grpc`.",
       "removal_hint": null,
       "removal_version": null,
       "scoped_cmd_line_args": [
@@ -26316,7 +26316,7 @@
             "details": "",
             "rank": "HARDCODED",
             "value": {
-              "user-agent": "pants/2.21.2rc1"
+              "user-agent": "pants/2.21.2rc2"
             }
           }
         ]
@@ -26692,7 +26692,7 @@
             "details": "",
             "rank": "HARDCODED",
             "value": {
-              "user-agent": "pants/2.21.2rc1"
+              "user-agent": "pants/2.21.2rc2"
             }
           }
         ]
@@ -27836,7 +27836,7 @@
       ],
       "env_var": "PANTS_SCALAFIX_LOCKFILE",
       "fromfile": false,
-      "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/scala/lint/scalafix/scalafix.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scalafix`.",
+      "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/scala/lint/scalafix/scalafix.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scalafix`.",
       "removal_hint": null,
       "removal_version": null,
       "scoped_cmd_line_args": [
@@ -28199,7 +28199,7 @@
       ],
       "env_var": "PANTS_SCALAFMT_LOCKFILE",
       "fromfile": false,
-      "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/scala/lint/scalafmt/scalafmt.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scalafmt`.",
+      "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/scala/lint/scalafmt/scalafmt.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scalafmt`.",
       "removal_hint": null,
       "removal_version": null,
       "scoped_cmd_line_args": [
@@ -28482,7 +28482,7 @@
       ],
       "env_var": "PANTS_SCALAPB_LOCKFILE",
       "fromfile": false,
-      "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/codegen/protobuf/scala/scalapbc.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scalapb`.",
+      "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/codegen/protobuf/scala/scalapbc.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scalapb`.",
       "removal_hint": null,
       "removal_version": null,
       "scoped_cmd_line_args": [
@@ -28682,7 +28682,7 @@
       ],
       "env_var": "PANTS_SCALATEST_LOCKFILE",
       "fromfile": false,
-      "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/scala/subsystems/scalatest.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scalatest`.",
+      "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/scala/subsystems/scalatest.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scalatest`.",
       "removal_hint": null,
       "removal_version": null,
       "scoped_cmd_line_args": [
@@ -29385,7 +29385,7 @@
       ],
       "env_var": "PANTS_SCROOGE_LOCKFILE",
       "fromfile": false,
-      "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/codegen/thrift/scrooge/scrooge.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scrooge`.",
+      "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/codegen/thrift/scrooge/scrooge.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scrooge`.",
       "removal_hint": null,
       "removal_version": null,
       "scoped_cmd_line_args": [
@@ -34678,12 +34678,12 @@
           {
             "details": null,
             "rank": "HARDCODED",
-            "value": "2.21.2rc1"
+            "value": "2.21.2rc2"
           },
           {
             "details": "from env var PANTS_VERSION",
             "rank": "ENVIRONMENT",
-            "value": "2.21.2rc1"
+            "value": "2.21.2rc2"
           }
         ]
       }
@@ -35713,21 +35713,22 @@
   "name_to_api_type_info": {
     "abc.EnvironmentAware": {
       "consumed_by_rules": [
-        "pants.core.util_rules.subprocess_environment.get_subprocess_environment"
+        "pants.jvm.jdk_rules.prepare_jdk_environment"
       ],
       "dependencies": [
-        "pants.backend.experimental.javascript"
+        "pants.backend.experimental.javascript",
+        "pants.core"
       ],
       "dependents": [
-        "pants.core"
+        "pants.backend.experimental.java"
       ],
       "documentation": null,
       "is_union": false,
       "module": "abc",
       "name": "EnvironmentAware",
-      "provider": "pants.core",
+      "provider": "pants.backend.experimental.java",
       "returned_by_rules": [
-        "construct_env_aware_scope_subprocess_environment"
+        "construct_env_aware_scope_jvm"
       ],
       "union_members": [],
       "union_type": null,
@@ -59436,19 +59437,19 @@
     },
     "pants.core.goals.fix.Batch": {
       "consumed_by_rules": [
-        "pants.backend.python.lint.add_trailing_comma.rules.add_trailing_comma_fmt"
+        "pants.backend.scala.lint.scalafix.rules.scalafix_fix"
       ],
       "dependencies": [
         "pants.core"
       ],
       "dependents": [
-        "pants.backend.experimental.python.lint.add_trailing_comma"
+        "pants.backend.experimental.scala.lint.scalafix"
       ],
       "documentation": "Batch(tool_name: 'str', elements: 'tuple[PartitionElementT, ...]', partition_metadata: 'PartitionMetadataT', snapshot: 'Snapshot')",
       "is_union": true,
       "module": "pants.core.goals.fix",
       "name": "Batch",
-      "provider": "pants.backend.experimental.python.lint.add_trailing_comma",
+      "provider": "pants.backend.experimental.scala.lint.scalafix",
       "returned_by_rules": [],
       "union_members": [],
       "union_type": "Batch",
@@ -60347,19 +60348,19 @@
     },
     "pants.core.goals.lint.Batch": {
       "consumed_by_rules": [
-        "pants.backend.terraform.lint.tfsec.rules.run_tfsec"
+        "pants.backend.scala.lint.scalafix.rules.scalafix_lint"
       ],
       "dependencies": [
         "pants.core"
       ],
       "dependents": [
-        "pants.backend.experimental.terraform.lint.tfsec"
+        "pants.backend.experimental.scala.lint.scalafix"
       ],
       "documentation": null,
       "is_union": true,
       "module": "pants.core.goals.lint",
       "name": "Batch",
-      "provider": "pants.backend.experimental.terraform.lint.tfsec",
+      "provider": "pants.backend.experimental.scala.lint.scalafix",
       "returned_by_rules": [],
       "union_members": [],
       "union_type": "Batch",
@@ -60536,19 +60537,19 @@
     },
     "pants.core.goals.lint.PartitionRequest": {
       "consumed_by_rules": [
-        "pants.core.util_rules.partitions._single_partition_file_rules.partitioner_DocformatterRequest"
+        "pants.core.util_rules.partitions._single_partition_field_set_rules.partitioner_PydocstyleRequest"
       ],
       "dependencies": [
         "pants.core"
       ],
       "dependents": [
-        "pants.backend.python.lint.docformatter"
+        "pants.backend.python.lint.pydocstyle"
       ],
       "documentation": null,
       "is_union": true,
       "module": "pants.core.goals.lint",
       "name": "PartitionRequest",
-      "provider": "pants.backend.python.lint.docformatter",
+      "provider": "pants.backend.python.lint.pydocstyle",
       "returned_by_rules": [],
       "union_members": [],
       "union_type": "PartitionRequest",
@@ -61662,21 +61663,21 @@
     },
     "pants.core.goals.test.Batch": {
       "consumed_by_rules": [
-        "pants.backend.scala.test.scalatest.run_scalatest_test",
-        "pants.backend.scala.test.scalatest.setup_scalatest_debug_request",
-        "pants.core.goals.test._unsupported_debug_adapter_rules.get_test_debug_adapter_request_ScalatestTestRequest"
+        "pants.core.goals.test._unsupported_debug_adapter_rules.get_test_debug_adapter_request_JunitTestRequest",
+        "pants.jvm.test.junit.run_junit_test",
+        "pants.jvm.test.junit.setup_junit_debug_request"
       ],
       "dependencies": [
         "pants.core"
       ],
       "dependents": [
-        "pants.backend.experimental.scala"
+        "pants.backend.experimental.java"
       ],
       "documentation": null,
       "is_union": true,
       "module": "pants.core.goals.test",
       "name": "Batch",
-      "provider": "pants.backend.experimental.scala",
+      "provider": "pants.backend.experimental.java",
       "returned_by_rules": [],
       "union_members": [],
       "union_type": "Batch",
@@ -63423,7 +63424,7 @@
       "is_union": false,
       "module": "pants.core.util_rules.environments",
       "name": "OptionField",
-      "provider": "pants.backend.docker",
+      "provider": "pants.backend.experimental.go",
       "returned_by_rules": [],
       "union_members": [],
       "union_type": "PluginField",
@@ -64766,19 +64767,19 @@
     },
     "pants.core.util_rules.wrap_source.GenerateWrapSourceSourcesRequest": {
       "consumed_by_rules": [
-        "pants.core.util_rules.wrap_source.wrap_source_rule_and_target.wrap_source_KotlinSourceField"
+        "pants.core.util_rules.wrap_source.wrap_source_rule_and_target.wrap_source_ScalaSourceField"
       ],
       "dependencies": [
         "pants.engine.target"
       ],
       "dependents": [
-        "pants.backend.experimental.kotlin"
+        "pants.backend.experimental.scala"
       ],
       "documentation": null,
       "is_union": false,
       "module": "pants.core.util_rules.wrap_source",
       "name": "GenerateWrapSourceSourcesRequest",
-      "provider": "pants.backend.experimental.kotlin",
+      "provider": "pants.backend.experimental.scala",
       "returned_by_rules": [],
       "union_members": [],
       "union_type": "GenerateSourcesRequest",
@@ -70991,7 +70992,7 @@
       "consumed_by_rules": [],
       "dependencies": [],
       "dependents": [
-        "pants.backend.experimental.docker.podman"
+        "pants.backend.python"
       ],
       "documentation": null,
       "is_union": true,
@@ -71000,7 +71001,7 @@
       "provider": "pants.option.subsystem",
       "returned_by_rules": [],
       "union_members": [
-        "ExperimentalPodmanOptions"
+        "ExportPluginOptions"
       ],
       "union_type": null,
       "used_in_rules": []
@@ -89897,68 +89898,60 @@
           "type_hint": "str | None"
         },
         {
-          "alias": "go_generate_env_vars",
+          "alias": "golang_go_search_paths",
           "default": null,
-          "description": "Overrides the default value from the option `[go-generate].env_vars` when this environment target is active.",
+          "description": "Overrides the default value from the option `[golang].go_search_paths` when this environment target is active.",
           "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_cgo_fortran_flags",
+          "alias": "golang_cgo_c_flags",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].cgo_fortran_flags` when this environment target is active.",
+          "description": "Overrides the default value from the option `[golang].cgo_c_flags` when this environment target is active.",
           "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_cgo_linker_flags",
+          "alias": "go_generate_env_vars",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].cgo_linker_flags` when this environment target is active.",
+          "description": "Overrides the default value from the option `[go-generate].env_vars` when this environment target is active.",
           "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "pyenv_python_provider_installation_extra_env_vars",
-          "default": null,
-          "description": "Overrides the default value from the option `[pyenv-python-provider].installation_extra_env_vars` when this environment target is active.",
-          "provider": "pants.backend.python.providers.experimental.pyenv",
-          "required": false,
-          "type_hint": "Iterable[str] | None"
-        },
-        {
-          "alias": "golang_cgo_tool_search_paths",
+          "alias": "golang_cgo_fortran_binary_name",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].cgo_tool_search_paths` when this environment target is active.",
+          "description": "Overrides the default value from the option `[golang].cgo_fortran_binary_name` when this environment target is active.",
           "provider": "pants.backend.experimental.go",
           "required": false,
-          "type_hint": "Iterable[str] | None"
+          "type_hint": "str | None"
         },
         {
-          "alias": "nodejs_executable_search_paths",
+          "alias": "python_native_code_cpp_flags",
           "default": null,
-          "description": "Overrides the default value from the option `[nodejs].executable_search_paths` when this environment target is active.",
-          "provider": "pants.backend.experimental.javascript",
+          "description": "Overrides the default value from the option `[python-native-code].cpp_flags` when this environment target is active.",
+          "provider": "pants.core",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "python_bootstrap_names",
+          "alias": "test_extra_env_vars",
           "default": null,
-          "description": "Overrides the default value from the option `[python-bootstrap].names` when this environment target is active.",
+          "description": "Overrides the default value from the option `[test].extra_env_vars` when this environment target is active.",
           "provider": "pants.core",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_external_linker_binary_name",
+          "alias": "system_binaries_system_binary_paths",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].external_linker_binary_name` when this environment target is active.",
-          "provider": "pants.backend.experimental.go",
+          "description": "Overrides the default value from the option `[system-binaries].system_binary_paths` when this environment target is active.",
+          "provider": "pants.core",
           "required": false,
-          "type_hint": "str | None"
+          "type_hint": "Iterable[str] | None"
         },
         {
           "alias": "nodejs_corepack_env_vars",
@@ -89969,116 +89962,124 @@
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_cgo_gxx_binary_name",
+          "alias": "golang_cgo_gcc_binary_name",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].cgo_gxx_binary_name` when this environment target is active.",
+          "description": "Overrides the default value from the option `[golang].cgo_gcc_binary_name` when this environment target is active.",
           "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "str | None"
         },
         {
-          "alias": "jvm_global_options",
+          "alias": "shell_setup_executable_search_paths",
           "default": null,
-          "description": "Overrides the default value from the option `[jvm].global_options` when this environment target is active.",
-          "provider": "pants.backend.experimental.java",
+          "description": "Overrides the default value from the option `[shell-setup].executable_search_paths` when this environment target is active.",
+          "provider": "pants.backend.shell",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "python_native_code_cpp_flags",
+          "alias": "pex_executable_search_paths",
           "default": null,
-          "description": "Overrides the default value from the option `[python-native-code].cpp_flags` when this environment target is active.",
+          "description": "Overrides the default value from the option `[pex].executable_search_paths` when this environment target is active.",
           "provider": "pants.core",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "pex_executable_search_paths",
+          "alias": "golang_cgo_fortran_flags",
           "default": null,
-          "description": "Overrides the default value from the option `[pex].executable_search_paths` when this environment target is active.",
-          "provider": "pants.core",
+          "description": "Overrides the default value from the option `[golang].cgo_fortran_flags` when this environment target is active.",
+          "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "shell_setup_executable_search_paths",
+          "alias": "golang_cgo_linker_flags",
           "default": null,
-          "description": "Overrides the default value from the option `[shell-setup].executable_search_paths` when this environment target is active.",
-          "provider": "pants.backend.shell",
+          "description": "Overrides the default value from the option `[golang].cgo_linker_flags` when this environment target is active.",
+          "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "python_bootstrap_search_path",
+          "alias": "nodejs_executable_search_paths",
           "default": null,
-          "description": "Overrides the default value from the option `[python-bootstrap].search_path` when this environment target is active.",
-          "provider": "pants.core",
+          "description": "Overrides the default value from the option `[nodejs].executable_search_paths` when this environment target is active.",
+          "provider": "pants.backend.experimental.javascript",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "test_extra_env_vars",
+          "alias": "golang_subprocess_env_vars",
           "default": null,
-          "description": "Overrides the default value from the option `[test].extra_env_vars` when this environment target is active.",
-          "provider": "pants.core",
+          "description": "Overrides the default value from the option `[golang].subprocess_env_vars` when this environment target is active.",
+          "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_cgo_cxx_flags",
+          "alias": "pyenv_python_provider_installation_extra_env_vars",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].cgo_cxx_flags` when this environment target is active.",
-          "provider": "pants.backend.experimental.go",
+          "description": "Overrides the default value from the option `[pyenv-python-provider].installation_extra_env_vars` when this environment target is active.",
+          "provider": "pants.backend.python.providers.experimental.pyenv",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "apache_thrift_thrift_search_paths",
+          "alias": "nodejs_search_path",
           "default": null,
-          "description": "Overrides the default value from the option `[apache-thrift].thrift_search_paths` when this environment target is active.",
-          "provider": "pants.backend.codegen.thrift.apache.python",
+          "description": "Overrides the default value from the option `[nodejs].search_path` when this environment target is active.",
+          "provider": "pants.backend.experimental.javascript",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_cgo_gcc_binary_name",
+          "alias": "docker_env_vars",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].cgo_gcc_binary_name` when this environment target is active.",
-          "provider": "pants.backend.experimental.go",
+          "description": "Overrides the default value from the option `[docker].env_vars` when this environment target is active.",
+          "provider": "pants.backend.docker",
           "required": false,
-          "type_hint": "str | None"
+          "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "system_binaries_system_binary_paths",
+          "alias": "apache_thrift_thrift_search_paths",
           "default": null,
-          "description": "Overrides the default value from the option `[system-binaries].system_binary_paths` when this environment target is active.",
+          "description": "Overrides the default value from the option `[apache-thrift].thrift_search_paths` when this environment target is active.",
+          "provider": "pants.backend.codegen.thrift.apache.python",
+          "required": false,
+          "type_hint": "Iterable[str] | None"
+        },
+        {
+          "alias": "python_bootstrap_search_path",
+          "default": null,
+          "description": "Overrides the default value from the option `[python-bootstrap].search_path` when this environment target is active.",
           "provider": "pants.core",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_cgo_c_flags",
+          "alias": "golang_external_linker_binary_name",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].cgo_c_flags` when this environment target is active.",
+          "description": "Overrides the default value from the option `[golang].external_linker_binary_name` when this environment target is active.",
           "provider": "pants.backend.experimental.go",
           "required": false,
-          "type_hint": "Iterable[str] | None"
+          "type_hint": "str | None"
         },
         {
-          "alias": "nodejs_search_path",
+          "alias": "subprocess_environment_env_vars",
           "default": null,
-          "description": "Overrides the default value from the option `[nodejs].search_path` when this environment target is active.",
-          "provider": "pants.backend.experimental.javascript",
+          "description": "Overrides the default value from the option `[subprocess-environment].env_vars` when this environment target is active.",
+          "provider": "pants.core",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_cgo_fortran_binary_name",
+          "alias": "python_native_code_ld_flags",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].cgo_fortran_binary_name` when this environment target is active.",
-          "provider": "pants.backend.experimental.go",
+          "description": "Overrides the default value from the option `[python-native-code].ld_flags` when this environment target is active.",
+          "provider": "pants.core",
           "required": false,
-          "type_hint": "str | None"
+          "type_hint": "Iterable[str] | None"
         },
         {
           "alias": "docker_executable_search_paths",
@@ -90089,41 +90090,41 @@
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_subprocess_env_vars",
+          "alias": "golang_cgo_gxx_binary_name",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].subprocess_env_vars` when this environment target is active.",
+          "description": "Overrides the default value from the option `[golang].cgo_gxx_binary_name` when this environment target is active.",
           "provider": "pants.backend.experimental.go",
           "required": false,
-          "type_hint": "Iterable[str] | None"
+          "type_hint": "str | None"
         },
         {
-          "alias": "python_native_code_ld_flags",
+          "alias": "jvm_global_options",
           "default": null,
-          "description": "Overrides the default value from the option `[python-native-code].ld_flags` when this environment target is active.",
-          "provider": "pants.core",
+          "description": "Overrides the default value from the option `[jvm].global_options` when this environment target is active.",
+          "provider": "pants.backend.experimental.java",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "docker_env_vars",
+          "alias": "python_bootstrap_names",
           "default": null,
-          "description": "Overrides the default value from the option `[docker].env_vars` when this environment target is active.",
-          "provider": "pants.backend.docker",
+          "description": "Overrides the default value from the option `[python-bootstrap].names` when this environment target is active.",
+          "provider": "pants.core",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "subprocess_environment_env_vars",
+          "alias": "golang_cgo_tool_search_paths",
           "default": null,
-          "description": "Overrides the default value from the option `[subprocess-environment].env_vars` when this environment target is active.",
-          "provider": "pants.core",
+          "description": "Overrides the default value from the option `[golang].cgo_tool_search_paths` when this environment target is active.",
+          "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_go_search_paths",
+          "alias": "golang_cgo_cxx_flags",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].go_search_paths` when this environment target is active.",
+          "description": "Overrides the default value from the option `[golang].cgo_cxx_flags` when this environment target is active.",
           "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "Iterable[str] | None"
@@ -91081,18 +91082,18 @@
           "type_hint": "bool"
         },
         {
-          "alias": "skip_gofmt",
+          "alias": "skip_go_vet",
           "default": "False",
-          "description": "If true, don't run gofmt on this package.",
-          "provider": "pants.backend.experimental.go",
+          "description": "If true, don't run `go vet` on this target's code.",
+          "provider": "pants.backend.experimental.go.lint.vet",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_go_vet",
+          "alias": "skip_gofmt",
           "default": "False",
-          "description": "If true, don't run `go vet` on this target's code.",
-          "provider": "pants.backend.experimental.go.lint.vet",
+          "description": "If true, don't run gofmt on this package.",
+          "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "bool"
         }
@@ -91305,20 +91306,12 @@
           "type_hint": "bool"
         },
         {
-          "alias": "skip_kubeconform",
-          "default": "False",
-          "description": "If set to true, do not run any kubeconform checking in this Helm target when running `pants check`.",
-          "provider": "pants.backend.experimental.helm.check.kubeconform",
-          "required": false,
-          "type_hint": "bool"
-        },
-        {
-          "alias": "kubeconform_kubernetes_version",
+          "alias": "kubeconform_ignore_sources",
           "default": null,
-          "description": "Kubernetes version to use for the validation.",
+          "description": "Regular expression patterns specifying paths to ignore.",
           "provider": "pants.backend.experimental.helm.check.kubeconform",
           "required": false,
-          "type_hint": "str | None"
+          "type_hint": "Iterable[str] | None"
         },
         {
           "alias": "kubeconform_reject_kinds",
@@ -91329,36 +91322,44 @@
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "kubeconform_ignore_missing_schemas",
+          "alias": "kubeconform_strict",
           "default": null,
-          "description": "Whether to fail if there are missing schemas for custom resources.",
+          "description": "Run Kubeconform in strict mode.",
           "provider": "pants.backend.experimental.helm.check.kubeconform",
           "required": false,
           "type_hint": "bool | None"
         },
         {
-          "alias": "kubeconform_ignore_sources",
+          "alias": "kubeconform_kubernetes_version",
           "default": null,
-          "description": "Regular expression patterns specifying paths to ignore.",
+          "description": "Kubernetes version to use for the validation.",
           "provider": "pants.backend.experimental.helm.check.kubeconform",
           "required": false,
-          "type_hint": "Iterable[str] | None"
+          "type_hint": "str | None"
         },
         {
-          "alias": "kubeconform_skip_kinds",
-          "default": null,
-          "description": "List of kinds or GVKs to ignore.",
+          "alias": "skip_kubeconform",
+          "default": "False",
+          "description": "If set to true, do not run any kubeconform checking in this Helm target when running `pants check`.",
           "provider": "pants.backend.experimental.helm.check.kubeconform",
           "required": false,
-          "type_hint": "Iterable[str] | None"
+          "type_hint": "bool"
         },
         {
-          "alias": "kubeconform_strict",
+          "alias": "kubeconform_ignore_missing_schemas",
           "default": null,
-          "description": "Run Kubeconform in strict mode.",
+          "description": "Whether to fail if there are missing schemas for custom resources.",
           "provider": "pants.backend.experimental.helm.check.kubeconform",
           "required": false,
           "type_hint": "bool | None"
+        },
+        {
+          "alias": "kubeconform_skip_kinds",
+          "default": null,
+          "description": "List of kinds or GVKs to ignore.",
+          "provider": "pants.backend.experimental.helm.check.kubeconform",
+          "required": false,
+          "type_hint": "Iterable[str] | None"
         }
       ],
       "provider": "pants.backend.experimental.helm",
@@ -91473,20 +91474,12 @@
           "type_hint": "bool"
         },
         {
-          "alias": "skip_kubeconform",
-          "default": "False",
-          "description": "If set to true, do not run any kubeconform checking in this Helm target when running `pants check`.",
-          "provider": "pants.backend.experimental.helm.check.kubeconform",
-          "required": false,
-          "type_hint": "bool"
-        },
-        {
-          "alias": "kubeconform_kubernetes_version",
+          "alias": "kubeconform_ignore_sources",
           "default": null,
-          "description": "Kubernetes version to use for the validation.",
+          "description": "Regular expression patterns specifying paths to ignore.",
           "provider": "pants.backend.experimental.helm.check.kubeconform",
           "required": false,
-          "type_hint": "str | None"
+          "type_hint": "Iterable[str] | None"
         },
         {
           "alias": "kubeconform_reject_kinds",
@@ -91497,36 +91490,44 @@
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "kubeconform_ignore_missing_schemas",
+          "alias": "kubeconform_strict",
           "default": null,
-          "description": "Whether to fail if there are missing schemas for custom resources.",
+          "description": "Run Kubeconform in strict mode.",
           "provider": "pants.backend.experimental.helm.check.kubeconform",
           "required": false,
           "type_hint": "bool | None"
         },
         {
-          "alias": "kubeconform_ignore_sources",
+          "alias": "kubeconform_kubernetes_version",
           "default": null,
-          "description": "Regular expression patterns specifying paths to ignore.",
+          "description": "Kubernetes version to use for the validation.",
           "provider": "pants.backend.experimental.helm.check.kubeconform",
           "required": false,
-          "type_hint": "Iterable[str] | None"
+          "type_hint": "str | None"
         },
         {
-          "alias": "kubeconform_skip_kinds",
-          "default": null,
-          "description": "List of kinds or GVKs to ignore.",
+          "alias": "skip_kubeconform",
+          "default": "False",
+          "description": "If set to true, do not run any kubeconform checking in this Helm target when running `pants check`.",
           "provider": "pants.backend.experimental.helm.check.kubeconform",
           "required": false,
-          "type_hint": "Iterable[str] | None"
+          "type_hint": "bool"
         },
         {
-          "alias": "kubeconform_strict",
+          "alias": "kubeconform_ignore_missing_schemas",
           "default": null,
-          "description": "Run Kubeconform in strict mode.",
+          "description": "Whether to fail if there are missing schemas for custom resources.",
           "provider": "pants.backend.experimental.helm.check.kubeconform",
           "required": false,
           "type_hint": "bool | None"
+        },
+        {
+          "alias": "kubeconform_skip_kinds",
+          "default": null,
+          "description": "List of kinds or GVKs to ignore.",
+          "provider": "pants.backend.experimental.helm.check.kubeconform",
+          "required": false,
+          "type_hint": "Iterable[str] | None"
         }
       ],
       "provider": "pants.backend.experimental.helm",
@@ -92259,7 +92260,7 @@
         {
           "alias": "packages",
           "default": null,
-          "description": "The JVM packages this artifact provides for the purposes of dependency inference.\n\nFor example, the JVM artifact `junit:junit` might provide `[\"org.junit.**\"]`.\n\nUsually you can leave this field off. If unspecified, Pants will fall back to the `[java-infer].third_party_import_mapping`, then to a built in mapping (https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/jvm/dependency_inference/jvm_artifact_mappings.py), and then finally it will default to the normalized `group` of the artifact. For example, in the absence of any other mapping the artifact `io.confluent:common-config` would default to providing `[\"io.confluent.**\"]`.\n\nThe package path may be made recursive to match symbols in subpackages by adding `.**` to the end of the package path. For example, specify `[\"org.junit.**\"]` to infer a dependency on the artifact for any file importing a symbol from `org.junit` or its subpackages.",
+          "description": "The JVM packages this artifact provides for the purposes of dependency inference.\n\nFor example, the JVM artifact `junit:junit` might provide `[\"org.junit.**\"]`.\n\nUsually you can leave this field off. If unspecified, Pants will fall back to the `[java-infer].third_party_import_mapping`, then to a built in mapping (https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/jvm/dependency_inference/jvm_artifact_mappings.py), and then finally it will default to the normalized `group` of the artifact. For example, in the absence of any other mapping the artifact `io.confluent:common-config` would default to providing `[\"io.confluent.**\"]`.\n\nThe package path may be made recursive to match symbols in subpackages by adding `.**` to the end of the package path. For example, specify `[\"org.junit.**\"]` to infer a dependency on the artifact for any file importing a symbol from `org.junit` or its subpackages.",
           "provider": "",
           "required": false,
           "type_hint": "Iterable[str] | None"
@@ -92881,68 +92882,60 @@
           "type_hint": "str | None"
         },
         {
-          "alias": "go_generate_env_vars",
+          "alias": "golang_go_search_paths",
           "default": null,
-          "description": "Overrides the default value from the option `[go-generate].env_vars` when this environment target is active.",
+          "description": "Overrides the default value from the option `[golang].go_search_paths` when this environment target is active.",
           "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_cgo_fortran_flags",
+          "alias": "golang_cgo_c_flags",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].cgo_fortran_flags` when this environment target is active.",
+          "description": "Overrides the default value from the option `[golang].cgo_c_flags` when this environment target is active.",
           "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_cgo_linker_flags",
+          "alias": "go_generate_env_vars",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].cgo_linker_flags` when this environment target is active.",
+          "description": "Overrides the default value from the option `[go-generate].env_vars` when this environment target is active.",
           "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "pyenv_python_provider_installation_extra_env_vars",
-          "default": null,
-          "description": "Overrides the default value from the option `[pyenv-python-provider].installation_extra_env_vars` when this environment target is active.",
-          "provider": "pants.backend.python.providers.experimental.pyenv",
-          "required": false,
-          "type_hint": "Iterable[str] | None"
-        },
-        {
-          "alias": "golang_cgo_tool_search_paths",
+          "alias": "golang_cgo_fortran_binary_name",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].cgo_tool_search_paths` when this environment target is active.",
+          "description": "Overrides the default value from the option `[golang].cgo_fortran_binary_name` when this environment target is active.",
           "provider": "pants.backend.experimental.go",
           "required": false,
-          "type_hint": "Iterable[str] | None"
+          "type_hint": "str | None"
         },
         {
-          "alias": "nodejs_executable_search_paths",
+          "alias": "python_native_code_cpp_flags",
           "default": null,
-          "description": "Overrides the default value from the option `[nodejs].executable_search_paths` when this environment target is active.",
-          "provider": "pants.backend.experimental.javascript",
+          "description": "Overrides the default value from the option `[python-native-code].cpp_flags` when this environment target is active.",
+          "provider": "pants.core",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "python_bootstrap_names",
+          "alias": "test_extra_env_vars",
           "default": null,
-          "description": "Overrides the default value from the option `[python-bootstrap].names` when this environment target is active.",
+          "description": "Overrides the default value from the option `[test].extra_env_vars` when this environment target is active.",
           "provider": "pants.core",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_external_linker_binary_name",
+          "alias": "system_binaries_system_binary_paths",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].external_linker_binary_name` when this environment target is active.",
-          "provider": "pants.backend.experimental.go",
+          "description": "Overrides the default value from the option `[system-binaries].system_binary_paths` when this environment target is active.",
+          "provider": "pants.core",
           "required": false,
-          "type_hint": "str | None"
+          "type_hint": "Iterable[str] | None"
         },
         {
           "alias": "nodejs_corepack_env_vars",
@@ -92953,116 +92946,124 @@
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_cgo_gxx_binary_name",
+          "alias": "golang_cgo_gcc_binary_name",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].cgo_gxx_binary_name` when this environment target is active.",
+          "description": "Overrides the default value from the option `[golang].cgo_gcc_binary_name` when this environment target is active.",
           "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "str | None"
         },
         {
-          "alias": "jvm_global_options",
+          "alias": "shell_setup_executable_search_paths",
           "default": null,
-          "description": "Overrides the default value from the option `[jvm].global_options` when this environment target is active.",
-          "provider": "pants.backend.experimental.java",
+          "description": "Overrides the default value from the option `[shell-setup].executable_search_paths` when this environment target is active.",
+          "provider": "pants.backend.shell",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "python_native_code_cpp_flags",
+          "alias": "pex_executable_search_paths",
           "default": null,
-          "description": "Overrides the default value from the option `[python-native-code].cpp_flags` when this environment target is active.",
+          "description": "Overrides the default value from the option `[pex].executable_search_paths` when this environment target is active.",
           "provider": "pants.core",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "pex_executable_search_paths",
+          "alias": "golang_cgo_fortran_flags",
           "default": null,
-          "description": "Overrides the default value from the option `[pex].executable_search_paths` when this environment target is active.",
-          "provider": "pants.core",
+          "description": "Overrides the default value from the option `[golang].cgo_fortran_flags` when this environment target is active.",
+          "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "shell_setup_executable_search_paths",
+          "alias": "golang_cgo_linker_flags",
           "default": null,
-          "description": "Overrides the default value from the option `[shell-setup].executable_search_paths` when this environment target is active.",
-          "provider": "pants.backend.shell",
+          "description": "Overrides the default value from the option `[golang].cgo_linker_flags` when this environment target is active.",
+          "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "python_bootstrap_search_path",
+          "alias": "nodejs_executable_search_paths",
           "default": null,
-          "description": "Overrides the default value from the option `[python-bootstrap].search_path` when this environment target is active.",
-          "provider": "pants.core",
+          "description": "Overrides the default value from the option `[nodejs].executable_search_paths` when this environment target is active.",
+          "provider": "pants.backend.experimental.javascript",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "test_extra_env_vars",
+          "alias": "golang_subprocess_env_vars",
           "default": null,
-          "description": "Overrides the default value from the option `[test].extra_env_vars` when this environment target is active.",
-          "provider": "pants.core",
+          "description": "Overrides the default value from the option `[golang].subprocess_env_vars` when this environment target is active.",
+          "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_cgo_cxx_flags",
+          "alias": "pyenv_python_provider_installation_extra_env_vars",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].cgo_cxx_flags` when this environment target is active.",
-          "provider": "pants.backend.experimental.go",
+          "description": "Overrides the default value from the option `[pyenv-python-provider].installation_extra_env_vars` when this environment target is active.",
+          "provider": "pants.backend.python.providers.experimental.pyenv",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "apache_thrift_thrift_search_paths",
+          "alias": "nodejs_search_path",
           "default": null,
-          "description": "Overrides the default value from the option `[apache-thrift].thrift_search_paths` when this environment target is active.",
-          "provider": "pants.backend.codegen.thrift.apache.python",
+          "description": "Overrides the default value from the option `[nodejs].search_path` when this environment target is active.",
+          "provider": "pants.backend.experimental.javascript",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_cgo_gcc_binary_name",
+          "alias": "docker_env_vars",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].cgo_gcc_binary_name` when this environment target is active.",
-          "provider": "pants.backend.experimental.go",
+          "description": "Overrides the default value from the option `[docker].env_vars` when this environment target is active.",
+          "provider": "pants.backend.docker",
           "required": false,
-          "type_hint": "str | None"
+          "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "system_binaries_system_binary_paths",
+          "alias": "apache_thrift_thrift_search_paths",
           "default": null,
-          "description": "Overrides the default value from the option `[system-binaries].system_binary_paths` when this environment target is active.",
+          "description": "Overrides the default value from the option `[apache-thrift].thrift_search_paths` when this environment target is active.",
+          "provider": "pants.backend.codegen.thrift.apache.python",
+          "required": false,
+          "type_hint": "Iterable[str] | None"
+        },
+        {
+          "alias": "python_bootstrap_search_path",
+          "default": null,
+          "description": "Overrides the default value from the option `[python-bootstrap].search_path` when this environment target is active.",
           "provider": "pants.core",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_cgo_c_flags",
+          "alias": "golang_external_linker_binary_name",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].cgo_c_flags` when this environment target is active.",
+          "description": "Overrides the default value from the option `[golang].external_linker_binary_name` when this environment target is active.",
           "provider": "pants.backend.experimental.go",
           "required": false,
-          "type_hint": "Iterable[str] | None"
+          "type_hint": "str | None"
         },
         {
-          "alias": "nodejs_search_path",
+          "alias": "subprocess_environment_env_vars",
           "default": null,
-          "description": "Overrides the default value from the option `[nodejs].search_path` when this environment target is active.",
-          "provider": "pants.backend.experimental.javascript",
+          "description": "Overrides the default value from the option `[subprocess-environment].env_vars` when this environment target is active.",
+          "provider": "pants.core",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_cgo_fortran_binary_name",
+          "alias": "python_native_code_ld_flags",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].cgo_fortran_binary_name` when this environment target is active.",
-          "provider": "pants.backend.experimental.go",
+          "description": "Overrides the default value from the option `[python-native-code].ld_flags` when this environment target is active.",
+          "provider": "pants.core",
           "required": false,
-          "type_hint": "str | None"
+          "type_hint": "Iterable[str] | None"
         },
         {
           "alias": "docker_executable_search_paths",
@@ -93073,41 +93074,41 @@
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_subprocess_env_vars",
+          "alias": "golang_cgo_gxx_binary_name",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].subprocess_env_vars` when this environment target is active.",
+          "description": "Overrides the default value from the option `[golang].cgo_gxx_binary_name` when this environment target is active.",
           "provider": "pants.backend.experimental.go",
           "required": false,
-          "type_hint": "Iterable[str] | None"
+          "type_hint": "str | None"
         },
         {
-          "alias": "python_native_code_ld_flags",
+          "alias": "jvm_global_options",
           "default": null,
-          "description": "Overrides the default value from the option `[python-native-code].ld_flags` when this environment target is active.",
-          "provider": "pants.core",
+          "description": "Overrides the default value from the option `[jvm].global_options` when this environment target is active.",
+          "provider": "pants.backend.experimental.java",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "docker_env_vars",
+          "alias": "python_bootstrap_names",
           "default": null,
-          "description": "Overrides the default value from the option `[docker].env_vars` when this environment target is active.",
-          "provider": "pants.backend.docker",
+          "description": "Overrides the default value from the option `[python-bootstrap].names` when this environment target is active.",
+          "provider": "pants.core",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "subprocess_environment_env_vars",
+          "alias": "golang_cgo_tool_search_paths",
           "default": null,
-          "description": "Overrides the default value from the option `[subprocess-environment].env_vars` when this environment target is active.",
-          "provider": "pants.core",
+          "description": "Overrides the default value from the option `[golang].cgo_tool_search_paths` when this environment target is active.",
+          "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_go_search_paths",
+          "alias": "golang_cgo_cxx_flags",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].go_search_paths` when this environment target is active.",
+          "description": "Overrides the default value from the option `[golang].cgo_cxx_flags` when this environment target is active.",
           "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "Iterable[str] | None"
@@ -93264,14 +93265,6 @@
           "required": false,
           "type_hint": "str | None"
         },
-        {
-          "alias": "java_model_package",
-          "default": null,
-          "description": "Root package for generated model code",
-          "provider": "pants.backend.experimental.openapi.codegen.java",
-          "required": false,
-          "type_hint": "str | None"
-        },
         {
           "alias": "jvm_jdk",
           "default": null,
@@ -93288,6 +93281,14 @@
           "required": false,
           "type_hint": "bool"
         },
+        {
+          "alias": "java_api_package",
+          "default": null,
+          "description": "Root package for generated API code",
+          "provider": "pants.backend.experimental.openapi.codegen.java",
+          "required": false,
+          "type_hint": "str | None"
+        },
         {
           "alias": "skip_spectral",
           "default": "False",
@@ -93297,9 +93298,9 @@
           "type_hint": "bool"
         },
         {
-          "alias": "java_api_package",
+          "alias": "java_model_package",
           "default": null,
-          "description": "Root package for generated API code",
+          "description": "Root package for generated model code",
           "provider": "pants.backend.experimental.openapi.codegen.java",
           "required": false,
           "type_hint": "str | None"
@@ -93344,14 +93345,6 @@
           "required": false,
           "type_hint": "str | None"
         },
-        {
-          "alias": "java_model_package",
-          "default": null,
-          "description": "Root package for generated model code",
-          "provider": "pants.backend.experimental.openapi.codegen.java",
-          "required": false,
-          "type_hint": "str | None"
-        },
         {
           "alias": "jvm_jdk",
           "default": null,
@@ -93368,6 +93361,14 @@
           "required": false,
           "type_hint": "bool"
         },
+        {
+          "alias": "java_api_package",
+          "default": null,
+          "description": "Root package for generated API code",
+          "provider": "pants.backend.experimental.openapi.codegen.java",
+          "required": false,
+          "type_hint": "str | None"
+        },
         {
           "alias": "skip_spectral",
           "default": "False",
@@ -93377,9 +93378,9 @@
           "type_hint": "bool"
         },
         {
-          "alias": "java_api_package",
+          "alias": "java_model_package",
           "default": null,
-          "description": "Root package for generated API code",
+          "description": "Root package for generated model code",
           "provider": "pants.backend.experimental.openapi.codegen.java",
           "required": false,
           "type_hint": "str | None"
@@ -93562,7 +93563,7 @@
         },
         {
           "alias": "version_spec",
-          "default": "'== 2.21.2rc1'",
+          "default": "'== 2.21.2rc2'",
           "description": "The PEP 440 version specifier version of Pants to target. E.g. `== 2.15.*`, or `>= 2.16.0, < 2.17.0`",
           "provider": "",
           "required": false,
@@ -94217,26 +94218,34 @@
           "type_hint": "bool"
         },
         {
-          "alias": "jvm_resolve",
+          "alias": "python_resolve",
           "default": null,
-          "description": "The resolve from `[jvm].resolves` to use when compiling this target.\n\nIf not defined, will default to `[jvm].default_resolve`.",
-          "provider": "pants.backend.experimental.codegen.protobuf.java",
+          "description": "The resolve from `[python].resolves` to use.\n\nIf not defined, will default to `[python].default_resolve`.\n\nAll dependencies must share the same value for their `resolve` field.",
+          "provider": "pants.backend.codegen.protobuf.python",
           "required": false,
           "type_hint": "str | None"
         },
         {
-          "alias": "jvm_jdk",
+          "alias": "go_mod_address",
           "default": null,
-          "description": "The major version of the JDK that this target should be built with. If not defined, will default to `[jvm].default_source_jdk`.",
+          "description": "Address of the `go_mod` target representing the Go module that this target is part of.\n\nThis field is similar to the `resolve` field used in the Python and JVM backends. If a codegen target such as `protobuf_sources` will be used in multiple Go modules, then you should use the `parametrize` built-in to parametrize that `protobuf_sources` target for each Go module.\n\nIf there is a single `go_mod` target in the repository, then this field defaults to the address for that single `go_mod` target.",
+          "provider": "pants.backend.experimental.codegen.protobuf.go",
+          "required": false,
+          "type_hint": "str | None"
+        },
+        {
+          "alias": "jvm_resolve",
+          "default": null,
+          "description": "The resolve from `[jvm].resolves` to use when compiling this target.\n\nIf not defined, will default to `[jvm].default_resolve`.",
           "provider": "pants.backend.experimental.codegen.protobuf.java",
           "required": false,
           "type_hint": "str | None"
         },
         {
-          "alias": "python_source_root",
+          "alias": "jvm_jdk",
           "default": null,
-          "description": "The source root to generate Python sources under.\n\nIf unspecified, the source root the `protobuf_sources` is under will be used.",
-          "provider": "pants.backend.codegen.protobuf.python",
+          "description": "The major version of the JDK that this target should be built with. If not defined, will default to `[jvm].default_source_jdk`.",
+          "provider": "pants.backend.experimental.codegen.protobuf.java",
           "required": false,
           "type_hint": "str | None"
         },
@@ -94249,20 +94258,20 @@
           "type_hint": "bool"
         },
         {
-          "alias": "python_resolve",
+          "alias": "python_interpreter_constraints",
           "default": null,
-          "description": "The resolve from `[python].resolves` to use.\n\nIf not defined, will default to `[python].default_resolve`.\n\nAll dependencies must share the same value for their `resolve` field.",
+          "description": "The Python interpreters this code is compatible with.\n\nEach element should be written in pip-style format, e.g. `CPython==2.7.*` or `CPython>=3.6,<4`. You can leave off `CPython` as a shorthand, e.g. `>=2.7` will be expanded to `CPython>=2.7`.\n\nSpecify more than one element to OR the constraints, e.g. `['PyPy==3.7.*', 'CPython==3.7.*']` means either PyPy 3.7 _or_ CPython 3.7.\n\nIf the field is not set, it will default to the option `[python].interpreter_constraints`.\n\nSee https://www.pantsbuild.org/2.21/docs/python/overview/interpreter-compatibility for how these interpreter constraints are merged with the constraints of dependencies.",
           "provider": "pants.backend.codegen.protobuf.python",
           "required": false,
-          "type_hint": "str | None"
+          "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "python_interpreter_constraints",
+          "alias": "python_source_root",
           "default": null,
-          "description": "The Python interpreters this code is compatible with.\n\nEach element should be written in pip-style format, e.g. `CPython==2.7.*` or `CPython>=3.6,<4`. You can leave off `CPython` as a shorthand, e.g. `>=2.7` will be expanded to `CPython>=2.7`.\n\nSpecify more than one element to OR the constraints, e.g. `['PyPy==3.7.*', 'CPython==3.7.*']` means either PyPy 3.7 _or_ CPython 3.7.\n\nIf the field is not set, it will default to the option `[python].interpreter_constraints`.\n\nSee https://www.pantsbuild.org/2.21/docs/python/overview/interpreter-compatibility for how these interpreter constraints are merged with the constraints of dependencies.",
+          "description": "The source root to generate Python sources under.\n\nIf unspecified, the source root the `protobuf_sources` is under will be used.",
           "provider": "pants.backend.codegen.protobuf.python",
           "required": false,
-          "type_hint": "Iterable[str] | None"
+          "type_hint": "str | None"
         },
         {
           "alias": "skip_buf_format",
@@ -94271,14 +94280,6 @@
           "provider": "pants.backend.codegen.protobuf.lint.buf",
           "required": false,
           "type_hint": "bool"
-        },
-        {
-          "alias": "go_mod_address",
-          "default": null,
-          "description": "Address of the `go_mod` target representing the Go module that this target is part of.\n\nThis field is similar to the `resolve` field used in the Python and JVM backends. If a codegen target such as `protobuf_sources` will be used in multiple Go modules, then you should use the `parametrize` built-in to parametrize that `protobuf_sources` target for each Go module.\n\nIf there is a single `go_mod` target in the repository, then this field defaults to the address for that single `go_mod` target.",
-          "provider": "pants.backend.experimental.codegen.protobuf.go",
-          "required": false,
-          "type_hint": "str | None"
         }
       ],
       "provider": "pants.backend.codegen.protobuf.python",
@@ -94328,6 +94329,14 @@
           "required": false,
           "type_hint": "str | None"
         },
+        {
+          "alias": "go_mod_address",
+          "default": null,
+          "description": "Address of the `go_mod` target representing the Go module that this target is part of.\n\nThis field is similar to the `resolve` field used in the Python and JVM backends. If a codegen target such as `protobuf_sources` will be used in multiple Go modules, then you should use the `parametrize` built-in to parametrize that `protobuf_sources` target for each Go module.\n\nIf there is a single `go_mod` target in the repository, then this field defaults to the address for that single `go_mod` target.",
+          "provider": "pants.backend.experimental.codegen.protobuf.go",
+          "required": false,
+          "type_hint": "str | None"
+        },
         {
           "alias": "jvm_jdk",
           "default": null,
@@ -94353,20 +94362,12 @@
           "type_hint": "bool"
         },
         {
-          "alias": "go_mod_address",
-          "default": null,
-          "description": "Address of the `go_mod` target representing the Go module that this target is part of.\n\nThis field is similar to the `resolve` field used in the Python and JVM backends. If a codegen target such as `protobuf_sources` will be used in multiple Go modules, then you should use the `parametrize` built-in to parametrize that `protobuf_sources` target for each Go module.\n\nIf there is a single `go_mod` target in the repository, then this field defaults to the address for that single `go_mod` target.",
-          "provider": "pants.backend.experimental.codegen.protobuf.go",
-          "required": false,
-          "type_hint": "str | None"
-        },
-        {
-          "alias": "python_interpreter_constraints",
+          "alias": "python_resolve",
           "default": null,
-          "description": "The Python interpreters this code is compatible with.\n\nEach element should be written in pip-style format, e.g. `CPython==2.7.*` or `CPython>=3.6,<4`. You can leave off `CPython` as a shorthand, e.g. `>=2.7` will be expanded to `CPython>=2.7`.\n\nSpecify more than one element to OR the constraints, e.g. `['PyPy==3.7.*', 'CPython==3.7.*']` means either PyPy 3.7 _or_ CPython 3.7.\n\nIf the field is not set, it will default to the option `[python].interpreter_constraints`.\n\nSee https://www.pantsbuild.org/2.21/docs/python/overview/interpreter-compatibility for how these interpreter constraints are merged with the constraints of dependencies.",
+          "description": "The resolve from `[python].resolves` to use.\n\nIf not defined, will default to `[python].default_resolve`.\n\nAll dependencies must share the same value for their `resolve` field.",
           "provider": "",
           "required": false,
-          "type_hint": "Iterable[str] | None"
+          "type_hint": "str | None"
         },
         {
           "alias": "python_source_root",
@@ -94377,12 +94378,12 @@
           "type_hint": "str | None"
         },
         {
-          "alias": "python_resolve",
+          "alias": "python_interpreter_constraints",
           "default": null,
-          "description": "The resolve from `[python].resolves` to use.\n\nIf not defined, will default to `[python].default_resolve`.\n\nAll dependencies must share the same value for their `resolve` field.",
+          "description": "The Python interpreters this code is compatible with.\n\nEach element should be written in pip-style format, e.g. `CPython==2.7.*` or `CPython>=3.6,<4`. You can leave off `CPython` as a shorthand, e.g. `>=2.7` will be expanded to `CPython>=2.7`.\n\nSpecify more than one element to OR the constraints, e.g. `['PyPy==3.7.*', 'CPython==3.7.*']` means either PyPy 3.7 _or_ CPython 3.7.\n\nIf the field is not set, it will default to the option `[python].interpreter_constraints`.\n\nSee https://www.pantsbuild.org/2.21/docs/python/overview/interpreter-compatibility for how these interpreter constraints are merged with the constraints of dependencies.",
           "provider": "",
           "required": false,
-          "type_hint": "str | None"
+          "type_hint": "Iterable[str] | None"
         },
         {
           "alias": "grpc",
@@ -94800,14 +94801,6 @@
           "required": false,
           "type_hint": "bool"
         },
-        {
-          "alias": "uses_mypyc",
-          "default": "False",
-          "description": "If true, this distribution is built using mypyc.\n\nIn this case, Pants will build the distribution in an environment that includes mypy, as configured in the `[mypy]` subsystem, including plugins, config files, extra type stubs, and the distribution's own requirements (which normally would not be needed at build time, but in this case may provide necessary type annotations).\n\nYou will typically set this field on distributions whose `setup.py` uses `mypyc.build.mypycify()`. See https://mypyc.readthedocs.io/en/latest/index.html .",
-          "provider": "pants.backend.python.typecheck.mypy",
-          "required": false,
-          "type_hint": "bool"
-        },
         {
           "alias": "repositories",
           "default": null,
@@ -94815,6 +94808,14 @@
           "provider": "pants.backend.experimental.python",
           "required": false,
           "type_hint": "Iterable[str] | None"
+        },
+        {
+          "alias": "uses_mypyc",
+          "default": "False",
+          "description": "If true, this distribution is built using mypyc.\n\nIn this case, Pants will build the distribution in an environment that includes mypy, as configured in the `[mypy]` subsystem, including plugins, config files, extra type stubs, and the distribution's own requirements (which normally would not be needed at build time, but in this case may provide necessary type annotations).\n\nYou will typically set this field on distributions whose `setup.py` uses `mypyc.build.mypycify()`. See https://mypyc.readthedocs.io/en/latest/index.html .",
+          "provider": "pants.backend.python.typecheck.mypy",
+          "required": false,
+          "type_hint": "bool"
         }
       ],
       "provider": "pants.backend.python",
@@ -94955,7 +94956,7 @@
         {
           "alias": "modules",
           "default": null,
-          "description": "The modules this requirement provides (used for dependency inference).\n\nFor example, the requirement `setuptools` provides `[\"setuptools\", \"pkg_resources\", \"easy_install\"]`.\n\nUsually you can leave this field off. If unspecified, Pants will first look at the default module mapping (https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/python/dependency_inference/default_module_mapping.py), and then will default to the normalized project name. For example, the requirement `Django` would default to the module `django`.\n\nMutually exclusive with the `type_stub_modules` field.",
+          "description": "The modules this requirement provides (used for dependency inference).\n\nFor example, the requirement `setuptools` provides `[\"setuptools\", \"pkg_resources\", \"easy_install\"]`.\n\nUsually you can leave this field off. If unspecified, Pants will first look at the default module mapping (https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/python/dependency_inference/default_module_mapping.py), and then will default to the normalized project name. For example, the requirement `Django` would default to the module `django`.\n\nMutually exclusive with the `type_stub_modules` field.",
           "provider": "",
           "required": false,
           "type_hint": "Iterable[str] | None"
@@ -94963,7 +94964,7 @@
         {
           "alias": "type_stub_modules",
           "default": null,
-          "description": "The modules this requirement provides if the requirement is a type stub (used for dependency inference).\n\nFor example, the requirement `types-requests` provides `[\"requests\"]`.\n\nUsually you can leave this field off. If unspecified, Pants will first look at the default module mapping (https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/python/dependency_inference/default_module_mapping.py). If not found _and_ the requirement name starts with `types-` or `stubs-`, or ends with `-types` or `-stubs`, will default to that requirement name without the prefix/suffix. For example, `types-requests` would default to `requests`. Otherwise, will be treated like a normal requirement (see the `modules` field).\n\nMutually exclusive with the `modules` field.",
+          "description": "The modules this requirement provides if the requirement is a type stub (used for dependency inference).\n\nFor example, the requirement `types-requests` provides `[\"requests\"]`.\n\nUsually you can leave this field off. If unspecified, Pants will first look at the default module mapping (https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/python/dependency_inference/default_module_mapping.py). If not found _and_ the requirement name starts with `types-` or `stubs-`, or ends with `-types` or `-stubs`, will default to that requirement name without the prefix/suffix. For example, `types-requests` would default to `requests`. Otherwise, will be treated like a normal requirement (see the `modules` field).\n\nMutually exclusive with the `modules` field.",
           "provider": "",
           "required": false,
           "type_hint": "Iterable[str] | None"
@@ -95121,41 +95122,41 @@
           "type_hint": "bool"
         },
         {
-          "alias": "skip_autoflake",
+          "alias": "skip_pyupgrade",
           "default": "False",
-          "description": "If true, don't run Autoflake on this target's code.",
-          "provider": "pants.backend.python.lint.autoflake",
+          "description": "If true, don't run pyupgrade on this target's code.",
+          "provider": "pants.backend.python.lint.pyupgrade",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_isort",
+          "alias": "skip_pyright",
           "default": "False",
-          "description": "If true, don't run isort on this target's code.",
-          "provider": "pants.backend.python.lint.isort",
+          "description": "If true, don't run Pyright on this target's code.",
+          "provider": "pants.backend.experimental.python.typecheck.pyright",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_yapf",
+          "alias": "skip_black",
           "default": "False",
-          "description": "If true, don't run yapf on this target's code.",
-          "provider": "pants.backend.python.lint.yapf",
+          "description": "If true, don't run Black on this target's code.",
+          "provider": "pants.backend.python.lint.black",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_ruff",
+          "alias": "skip_bandit",
           "default": "False",
-          "description": "If True, do not run any Ruff tools on this target's code.",
-          "provider": "pants.backend.experimental.python.lint.ruff",
+          "description": "If true, don't run Bandit on this target's code.",
+          "provider": "pants.backend.python.lint.bandit",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_ruff_check",
+          "alias": "skip_ruff",
           "default": "False",
-          "description": "If true, don't run the ruff checker on this target's code.",
+          "description": "If True, do not run any Ruff tools on this target's code.",
           "provider": "pants.backend.experimental.python.lint.ruff",
           "required": false,
           "type_hint": "bool"
@@ -95169,34 +95170,34 @@
           "type_hint": "bool"
         },
         {
-          "alias": "skip_pyright",
+          "alias": "skip_pydocstyle",
           "default": "False",
-          "description": "If true, don't run Pyright on this target's code.",
-          "provider": "pants.backend.experimental.python.typecheck.pyright",
+          "description": "If true, don't run pydocstyle on this target's code.",
+          "provider": "pants.backend.python.lint.pydocstyle",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_add_trailing_comma",
+          "alias": "skip_pylint",
           "default": "False",
-          "description": "If true, don't run add-trailing-comma on this target's code.",
-          "provider": "pants.backend.experimental.python.lint.add_trailing_comma",
+          "description": "If true, don't run Pylint on this target's code.",
+          "provider": "pants.backend.python.lint.pylint",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_flake8",
+          "alias": "skip_yapf",
           "default": "False",
-          "description": "If true, don't run Flake8 on this target's code.",
-          "provider": "pants.backend.python.lint.flake8",
+          "description": "If true, don't run yapf on this target's code.",
+          "provider": "pants.backend.python.lint.yapf",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_pylint",
+          "alias": "skip_pytype",
           "default": "False",
-          "description": "If true, don't run Pylint on this target's code.",
-          "provider": "pants.backend.python.lint.pylint",
+          "description": "If true, don't run pytype on this target's code.",
+          "provider": "pants.backend.experimental.python.typecheck.pytype",
           "required": false,
           "type_hint": "bool"
         },
@@ -95209,10 +95210,10 @@
           "type_hint": "bool"
         },
         {
-          "alias": "skip_pytype",
+          "alias": "skip_add_trailing_comma",
           "default": "False",
-          "description": "If true, don't run pytype on this target's code.",
-          "provider": "pants.backend.experimental.python.typecheck.pytype",
+          "description": "If true, don't run add-trailing-comma on this target's code.",
+          "provider": "pants.backend.experimental.python.lint.add_trailing_comma",
           "required": false,
           "type_hint": "bool"
         },
@@ -95225,34 +95226,34 @@
           "type_hint": "bool"
         },
         {
-          "alias": "skip_bandit",
+          "alias": "skip_flake8",
           "default": "False",
-          "description": "If true, don't run Bandit on this target's code.",
-          "provider": "pants.backend.python.lint.bandit",
+          "description": "If true, don't run Flake8 on this target's code.",
+          "provider": "pants.backend.python.lint.flake8",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_pydocstyle",
+          "alias": "skip_isort",
           "default": "False",
-          "description": "If true, don't run pydocstyle on this target's code.",
-          "provider": "pants.backend.python.lint.pydocstyle",
+          "description": "If true, don't run isort on this target's code.",
+          "provider": "pants.backend.python.lint.isort",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_black",
+          "alias": "skip_ruff_check",
           "default": "False",
-          "description": "If true, don't run Black on this target's code.",
-          "provider": "pants.backend.python.lint.black",
+          "description": "If true, don't run the ruff checker on this target's code.",
+          "provider": "pants.backend.experimental.python.lint.ruff",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_pyupgrade",
+          "alias": "skip_autoflake",
           "default": "False",
-          "description": "If true, don't run pyupgrade on this target's code.",
-          "provider": "pants.backend.python.lint.pyupgrade",
+          "description": "If true, don't run Autoflake on this target's code.",
+          "provider": "pants.backend.python.lint.autoflake",
           "required": false,
           "type_hint": "bool"
         }
@@ -95297,41 +95298,41 @@
           "type_hint": "Dict[Union[str, Tuple[str, ...]], Dict[str, Any]] | None"
         },
         {
-          "alias": "skip_autoflake",
+          "alias": "skip_pyupgrade",
           "default": "False",
-          "description": "If true, don't run Autoflake on this target's code.",
-          "provider": "pants.backend.python.lint.autoflake",
+          "description": "If true, don't run pyupgrade on this target's code.",
+          "provider": "pants.backend.python.lint.pyupgrade",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_isort",
+          "alias": "skip_pyright",
           "default": "False",
-          "description": "If true, don't run isort on this target's code.",
-          "provider": "pants.backend.python.lint.isort",
+          "description": "If true, don't run Pyright on this target's code.",
+          "provider": "pants.backend.experimental.python.typecheck.pyright",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_yapf",
+          "alias": "skip_black",
           "default": "False",
-          "description": "If true, don't run yapf on this target's code.",
-          "provider": "pants.backend.python.lint.yapf",
+          "description": "If true, don't run Black on this target's code.",
+          "provider": "pants.backend.python.lint.black",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_ruff",
+          "alias": "skip_bandit",
           "default": "False",
-          "description": "If True, do not run any Ruff tools on this target's code.",
-          "provider": "pants.backend.experimental.python.lint.ruff",
+          "description": "If true, don't run Bandit on this target's code.",
+          "provider": "pants.backend.python.lint.bandit",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_ruff_check",
+          "alias": "skip_ruff",
           "default": "False",
-          "description": "If true, don't run the ruff checker on this target's code.",
+          "description": "If True, do not run any Ruff tools on this target's code.",
           "provider": "pants.backend.experimental.python.lint.ruff",
           "required": false,
           "type_hint": "bool"
@@ -95345,34 +95346,34 @@
           "type_hint": "bool"
         },
         {
-          "alias": "skip_pyright",
+          "alias": "skip_pydocstyle",
           "default": "False",
-          "description": "If true, don't run Pyright on this target's code.",
-          "provider": "pants.backend.experimental.python.typecheck.pyright",
+          "description": "If true, don't run pydocstyle on this target's code.",
+          "provider": "pants.backend.python.lint.pydocstyle",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_add_trailing_comma",
+          "alias": "skip_pylint",
           "default": "False",
-          "description": "If true, don't run add-trailing-comma on this target's code.",
-          "provider": "pants.backend.experimental.python.lint.add_trailing_comma",
+          "description": "If true, don't run Pylint on this target's code.",
+          "provider": "pants.backend.python.lint.pylint",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_flake8",
+          "alias": "skip_yapf",
           "default": "False",
-          "description": "If true, don't run Flake8 on this target's code.",
-          "provider": "pants.backend.python.lint.flake8",
+          "description": "If true, don't run yapf on this target's code.",
+          "provider": "pants.backend.python.lint.yapf",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_pylint",
+          "alias": "skip_pytype",
           "default": "False",
-          "description": "If true, don't run Pylint on this target's code.",
-          "provider": "pants.backend.python.lint.pylint",
+          "description": "If true, don't run pytype on this target's code.",
+          "provider": "pants.backend.experimental.python.typecheck.pytype",
           "required": false,
           "type_hint": "bool"
         },
@@ -95385,10 +95386,10 @@
           "type_hint": "bool"
         },
         {
-          "alias": "skip_pytype",
+          "alias": "skip_add_trailing_comma",
           "default": "False",
-          "description": "If true, don't run pytype on this target's code.",
-          "provider": "pants.backend.experimental.python.typecheck.pytype",
+          "description": "If true, don't run add-trailing-comma on this target's code.",
+          "provider": "pants.backend.experimental.python.lint.add_trailing_comma",
           "required": false,
           "type_hint": "bool"
         },
@@ -95401,34 +95402,34 @@
           "type_hint": "bool"
         },
         {
-          "alias": "skip_bandit",
+          "alias": "skip_flake8",
           "default": "False",
-          "description": "If true, don't run Bandit on this target's code.",
-          "provider": "pants.backend.python.lint.bandit",
+          "description": "If true, don't run Flake8 on this target's code.",
+          "provider": "pants.backend.python.lint.flake8",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_pydocstyle",
+          "alias": "skip_isort",
           "default": "False",
-          "description": "If true, don't run pydocstyle on this target's code.",
-          "provider": "pants.backend.python.lint.pydocstyle",
+          "description": "If true, don't run isort on this target's code.",
+          "provider": "pants.backend.python.lint.isort",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_black",
+          "alias": "skip_ruff_check",
           "default": "False",
-          "description": "If true, don't run Black on this target's code.",
-          "provider": "pants.backend.python.lint.black",
+          "description": "If true, don't run the ruff checker on this target's code.",
+          "provider": "pants.backend.experimental.python.lint.ruff",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_pyupgrade",
+          "alias": "skip_autoflake",
           "default": "False",
-          "description": "If true, don't run pyupgrade on this target's code.",
-          "provider": "pants.backend.python.lint.pyupgrade",
+          "description": "If true, don't run Autoflake on this target's code.",
+          "provider": "pants.backend.python.lint.autoflake",
           "required": false,
           "type_hint": "bool"
         },
@@ -95593,41 +95594,41 @@
           "type_hint": "str"
         },
         {
-          "alias": "skip_autoflake",
+          "alias": "skip_pyupgrade",
           "default": "False",
-          "description": "If true, don't run Autoflake on this target's code.",
-          "provider": "pants.backend.python.lint.autoflake",
+          "description": "If true, don't run pyupgrade on this target's code.",
+          "provider": "pants.backend.python.lint.pyupgrade",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_isort",
+          "alias": "skip_pyright",
           "default": "False",
-          "description": "If true, don't run isort on this target's code.",
-          "provider": "pants.backend.python.lint.isort",
+          "description": "If true, don't run Pyright on this target's code.",
+          "provider": "pants.backend.experimental.python.typecheck.pyright",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_yapf",
+          "alias": "skip_black",
           "default": "False",
-          "description": "If true, don't run yapf on this target's code.",
-          "provider": "pants.backend.python.lint.yapf",
+          "description": "If true, don't run Black on this target's code.",
+          "provider": "pants.backend.python.lint.black",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_ruff",
+          "alias": "skip_bandit",
           "default": "False",
-          "description": "If True, do not run any Ruff tools on this target's code.",
-          "provider": "pants.backend.experimental.python.lint.ruff",
+          "description": "If true, don't run Bandit on this target's code.",
+          "provider": "pants.backend.python.lint.bandit",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_ruff_check",
+          "alias": "skip_ruff",
           "default": "False",
-          "description": "If true, don't run the ruff checker on this target's code.",
+          "description": "If True, do not run any Ruff tools on this target's code.",
           "provider": "pants.backend.experimental.python.lint.ruff",
           "required": false,
           "type_hint": "bool"
@@ -95641,42 +95642,34 @@
           "type_hint": "bool"
         },
         {
-          "alias": "skip_pyright",
-          "default": "False",
-          "description": "If true, don't run Pyright on this target's code.",
-          "provider": "pants.backend.experimental.python.typecheck.pyright",
-          "required": false,
-          "type_hint": "bool"
-        },
-        {
-          "alias": "skip_add_trailing_comma",
+          "alias": "skip_pydocstyle",
           "default": "False",
-          "description": "If true, don't run add-trailing-comma on this target's code.",
-          "provider": "pants.backend.experimental.python.lint.add_trailing_comma",
+          "description": "If true, don't run pydocstyle on this target's code.",
+          "provider": "pants.backend.python.lint.pydocstyle",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_bandit",
+          "alias": "skip_pylint",
           "default": "False",
-          "description": "If true, don't run Bandit on this target's code.",
-          "provider": "pants.backend.python.lint.bandit",
+          "description": "If true, don't run Pylint on this target's code.",
+          "provider": "pants.backend.python.lint.pylint",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_flake8",
+          "alias": "skip_yapf",
           "default": "False",
-          "description": "If true, don't run Flake8 on this target's code.",
-          "provider": "pants.backend.python.lint.flake8",
+          "description": "If true, don't run yapf on this target's code.",
+          "provider": "pants.backend.python.lint.yapf",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_pylint",
+          "alias": "skip_pytype",
           "default": "False",
-          "description": "If true, don't run Pylint on this target's code.",
-          "provider": "pants.backend.python.lint.pylint",
+          "description": "If true, don't run pytype on this target's code.",
+          "provider": "pants.backend.experimental.python.typecheck.pytype",
           "required": false,
           "type_hint": "bool"
         },
@@ -95689,10 +95682,10 @@
           "type_hint": "bool"
         },
         {
-          "alias": "skip_pytype",
+          "alias": "skip_add_trailing_comma",
           "default": "False",
-          "description": "If true, don't run pytype on this target's code.",
-          "provider": "pants.backend.experimental.python.typecheck.pytype",
+          "description": "If true, don't run add-trailing-comma on this target's code.",
+          "provider": "pants.backend.experimental.python.lint.add_trailing_comma",
           "required": false,
           "type_hint": "bool"
         },
@@ -95705,34 +95698,42 @@
           "type_hint": "bool"
         },
         {
-          "alias": "stevedore_namespaces",
-          "default": null,
-          "description": "List the stevedore namespaces required by this target.\n\nCode for all `entry_points` on `python_distribution` targets with these namespaces will be added as dependencies so that they are available on PYTHONPATH during tests. Note that this is only a subset of the `python_distribution`s dependencies, so the `entry_points` only need to be defined on one `python_distribution` even if the test only needs some of the `entry_points` namespaces on it.\n\nPlus, an `entry_points.txt` file will be generated in the sandbox so that each of the `python_distribution`s appear to be \"installed\". The `entry_points.txt` file will only include the namespaces requested on this field. Without this, stevedore would not be able to look up plugins in the setuptools `entry_points` metadata.\n\nNOTE: Each `python_distribution` must opt-in to being included in this repo-wide inference by tagging the namespaces with `stevedore_namespace(\"my.stevedore.extension\")`.\n\nThe stevedore namespace format (`my.stevedore.extension`) is similar to a Python namespace.",
-          "provider": "pants.backend.experimental.python.framework.stevedore",
+          "alias": "skip_flake8",
+          "default": "False",
+          "description": "If true, don't run Flake8 on this target's code.",
+          "provider": "pants.backend.python.lint.flake8",
           "required": false,
-          "type_hint": "Iterable[str] | None"
+          "type_hint": "bool"
         },
         {
-          "alias": "skip_pydocstyle",
+          "alias": "skip_isort",
           "default": "False",
-          "description": "If true, don't run pydocstyle on this target's code.",
-          "provider": "pants.backend.python.lint.pydocstyle",
+          "description": "If true, don't run isort on this target's code.",
+          "provider": "pants.backend.python.lint.isort",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_black",
+          "alias": "skip_ruff_check",
           "default": "False",
-          "description": "If true, don't run Black on this target's code.",
-          "provider": "pants.backend.python.lint.black",
+          "description": "If true, don't run the ruff checker on this target's code.",
+          "provider": "pants.backend.experimental.python.lint.ruff",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_pyupgrade",
+          "alias": "stevedore_namespaces",
+          "default": null,
+          "description": "List the stevedore namespaces required by this target.\n\nCode for all `entry_points` on `python_distribution` targets with these namespaces will be added as dependencies so that they are available on PYTHONPATH during tests. Note that this is only a subset of the `python_distribution`s dependencies, so the `entry_points` only need to be defined on one `python_distribution` even if the test only needs some of the `entry_points` namespaces on it.\n\nPlus, an `entry_points.txt` file will be generated in the sandbox so that each of the `python_distribution`s appear to be \"installed\". The `entry_points.txt` file will only include the namespaces requested on this field. Without this, stevedore would not be able to look up plugins in the setuptools `entry_points` metadata.\n\nNOTE: Each `python_distribution` must opt-in to being included in this repo-wide inference by tagging the namespaces with `stevedore_namespace(\"my.stevedore.extension\")`.\n\nThe stevedore namespace format (`my.stevedore.extension`) is similar to a Python namespace.",
+          "provider": "pants.backend.experimental.python.framework.stevedore",
+          "required": false,
+          "type_hint": "Iterable[str] | None"
+        },
+        {
+          "alias": "skip_autoflake",
           "default": "False",
-          "description": "If true, don't run pyupgrade on this target's code.",
-          "provider": "pants.backend.python.lint.pyupgrade",
+          "description": "If true, don't run Autoflake on this target's code.",
+          "provider": "pants.backend.python.lint.autoflake",
           "required": false,
           "type_hint": "bool"
         }
@@ -95777,41 +95778,41 @@
           "type_hint": "Dict[Union[str, Tuple[str, ...]], Dict[str, Any]] | None"
         },
         {
-          "alias": "skip_autoflake",
+          "alias": "skip_pyupgrade",
           "default": "False",
-          "description": "If true, don't run Autoflake on this target's code.",
-          "provider": "pants.backend.python.lint.autoflake",
+          "description": "If true, don't run pyupgrade on this target's code.",
+          "provider": "pants.backend.python.lint.pyupgrade",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_isort",
+          "alias": "skip_pyright",
           "default": "False",
-          "description": "If true, don't run isort on this target's code.",
-          "provider": "pants.backend.python.lint.isort",
+          "description": "If true, don't run Pyright on this target's code.",
+          "provider": "pants.backend.experimental.python.typecheck.pyright",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_yapf",
+          "alias": "skip_black",
           "default": "False",
-          "description": "If true, don't run yapf on this target's code.",
-          "provider": "pants.backend.python.lint.yapf",
+          "description": "If true, don't run Black on this target's code.",
+          "provider": "pants.backend.python.lint.black",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_ruff",
+          "alias": "skip_bandit",
           "default": "False",
-          "description": "If True, do not run any Ruff tools on this target's code.",
-          "provider": "pants.backend.experimental.python.lint.ruff",
+          "description": "If true, don't run Bandit on this target's code.",
+          "provider": "pants.backend.python.lint.bandit",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_ruff_check",
+          "alias": "skip_ruff",
           "default": "False",
-          "description": "If true, don't run the ruff checker on this target's code.",
+          "description": "If True, do not run any Ruff tools on this target's code.",
           "provider": "pants.backend.experimental.python.lint.ruff",
           "required": false,
           "type_hint": "bool"
@@ -95825,34 +95826,34 @@
           "type_hint": "bool"
         },
         {
-          "alias": "skip_pyright",
+          "alias": "skip_pydocstyle",
           "default": "False",
-          "description": "If true, don't run Pyright on this target's code.",
-          "provider": "pants.backend.experimental.python.typecheck.pyright",
+          "description": "If true, don't run pydocstyle on this target's code.",
+          "provider": "pants.backend.python.lint.pydocstyle",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_add_trailing_comma",
+          "alias": "skip_pylint",
           "default": "False",
-          "description": "If true, don't run add-trailing-comma on this target's code.",
-          "provider": "pants.backend.experimental.python.lint.add_trailing_comma",
+          "description": "If true, don't run Pylint on this target's code.",
+          "provider": "pants.backend.python.lint.pylint",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_flake8",
+          "alias": "skip_yapf",
           "default": "False",
-          "description": "If true, don't run Flake8 on this target's code.",
-          "provider": "pants.backend.python.lint.flake8",
+          "description": "If true, don't run yapf on this target's code.",
+          "provider": "pants.backend.python.lint.yapf",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_pylint",
+          "alias": "skip_pytype",
           "default": "False",
-          "description": "If true, don't run Pylint on this target's code.",
-          "provider": "pants.backend.python.lint.pylint",
+          "description": "If true, don't run pytype on this target's code.",
+          "provider": "pants.backend.experimental.python.typecheck.pytype",
           "required": false,
           "type_hint": "bool"
         },
@@ -95865,10 +95866,10 @@
           "type_hint": "bool"
         },
         {
-          "alias": "skip_pytype",
+          "alias": "skip_add_trailing_comma",
           "default": "False",
-          "description": "If true, don't run pytype on this target's code.",
-          "provider": "pants.backend.experimental.python.typecheck.pytype",
+          "description": "If true, don't run add-trailing-comma on this target's code.",
+          "provider": "pants.backend.experimental.python.lint.add_trailing_comma",
           "required": false,
           "type_hint": "bool"
         },
@@ -95881,34 +95882,34 @@
           "type_hint": "bool"
         },
         {
-          "alias": "skip_bandit",
+          "alias": "skip_flake8",
           "default": "False",
-          "description": "If true, don't run Bandit on this target's code.",
-          "provider": "pants.backend.python.lint.bandit",
+          "description": "If true, don't run Flake8 on this target's code.",
+          "provider": "pants.backend.python.lint.flake8",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_pydocstyle",
+          "alias": "skip_isort",
           "default": "False",
-          "description": "If true, don't run pydocstyle on this target's code.",
-          "provider": "pants.backend.python.lint.pydocstyle",
+          "description": "If true, don't run isort on this target's code.",
+          "provider": "pants.backend.python.lint.isort",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_black",
+          "alias": "skip_ruff_check",
           "default": "False",
-          "description": "If true, don't run Black on this target's code.",
-          "provider": "pants.backend.python.lint.black",
+          "description": "If true, don't run the ruff checker on this target's code.",
+          "provider": "pants.backend.experimental.python.lint.ruff",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_pyupgrade",
+          "alias": "skip_autoflake",
           "default": "False",
-          "description": "If true, don't run pyupgrade on this target's code.",
-          "provider": "pants.backend.python.lint.pyupgrade",
+          "description": "If true, don't run Autoflake on this target's code.",
+          "provider": "pants.backend.python.lint.autoflake",
           "required": false,
           "type_hint": "bool"
         },
@@ -95985,41 +95986,41 @@
           "type_hint": "Dict[Union[str, Tuple[str, ...]], Dict[str, Any]] | None"
         },
         {
-          "alias": "skip_autoflake",
+          "alias": "skip_pyupgrade",
           "default": "False",
-          "description": "If true, don't run Autoflake on this target's code.",
-          "provider": "pants.backend.python.lint.autoflake",
+          "description": "If true, don't run pyupgrade on this target's code.",
+          "provider": "pants.backend.python.lint.pyupgrade",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_isort",
+          "alias": "skip_pyright",
           "default": "False",
-          "description": "If true, don't run isort on this target's code.",
-          "provider": "pants.backend.python.lint.isort",
+          "description": "If true, don't run Pyright on this target's code.",
+          "provider": "pants.backend.experimental.python.typecheck.pyright",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_yapf",
+          "alias": "skip_black",
           "default": "False",
-          "description": "If true, don't run yapf on this target's code.",
-          "provider": "pants.backend.python.lint.yapf",
+          "description": "If true, don't run Black on this target's code.",
+          "provider": "pants.backend.python.lint.black",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_ruff",
+          "alias": "skip_bandit",
           "default": "False",
-          "description": "If True, do not run any Ruff tools on this target's code.",
-          "provider": "pants.backend.experimental.python.lint.ruff",
+          "description": "If true, don't run Bandit on this target's code.",
+          "provider": "pants.backend.python.lint.bandit",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_ruff_check",
+          "alias": "skip_ruff",
           "default": "False",
-          "description": "If true, don't run the ruff checker on this target's code.",
+          "description": "If True, do not run any Ruff tools on this target's code.",
           "provider": "pants.backend.experimental.python.lint.ruff",
           "required": false,
           "type_hint": "bool"
@@ -96033,42 +96034,34 @@
           "type_hint": "bool"
         },
         {
-          "alias": "skip_pyright",
-          "default": "False",
-          "description": "If true, don't run Pyright on this target's code.",
-          "provider": "pants.backend.experimental.python.typecheck.pyright",
-          "required": false,
-          "type_hint": "bool"
-        },
-        {
-          "alias": "skip_add_trailing_comma",
+          "alias": "skip_pydocstyle",
           "default": "False",
-          "description": "If true, don't run add-trailing-comma on this target's code.",
-          "provider": "pants.backend.experimental.python.lint.add_trailing_comma",
+          "description": "If true, don't run pydocstyle on this target's code.",
+          "provider": "pants.backend.python.lint.pydocstyle",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_bandit",
+          "alias": "skip_pylint",
           "default": "False",
-          "description": "If true, don't run Bandit on this target's code.",
-          "provider": "pants.backend.python.lint.bandit",
+          "description": "If true, don't run Pylint on this target's code.",
+          "provider": "pants.backend.python.lint.pylint",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_flake8",
+          "alias": "skip_yapf",
           "default": "False",
-          "description": "If true, don't run Flake8 on this target's code.",
-          "provider": "pants.backend.python.lint.flake8",
+          "description": "If true, don't run yapf on this target's code.",
+          "provider": "pants.backend.python.lint.yapf",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_pylint",
+          "alias": "skip_pytype",
           "default": "False",
-          "description": "If true, don't run Pylint on this target's code.",
-          "provider": "pants.backend.python.lint.pylint",
+          "description": "If true, don't run pytype on this target's code.",
+          "provider": "pants.backend.experimental.python.typecheck.pytype",
           "required": false,
           "type_hint": "bool"
         },
@@ -96081,10 +96074,10 @@
           "type_hint": "bool"
         },
         {
-          "alias": "skip_pytype",
+          "alias": "skip_add_trailing_comma",
           "default": "False",
-          "description": "If true, don't run pytype on this target's code.",
-          "provider": "pants.backend.experimental.python.typecheck.pytype",
+          "description": "If true, don't run add-trailing-comma on this target's code.",
+          "provider": "pants.backend.experimental.python.lint.add_trailing_comma",
           "required": false,
           "type_hint": "bool"
         },
@@ -96097,34 +96090,42 @@
           "type_hint": "bool"
         },
         {
-          "alias": "stevedore_namespaces",
-          "default": null,
-          "description": "List the stevedore namespaces required by this target.\n\nCode for all `entry_points` on `python_distribution` targets with these namespaces will be added as dependencies so that they are available on PYTHONPATH during tests. Note that this is only a subset of the `python_distribution`s dependencies, so the `entry_points` only need to be defined on one `python_distribution` even if the test only needs some of the `entry_points` namespaces on it.\n\nPlus, an `entry_points.txt` file will be generated in the sandbox so that each of the `python_distribution`s appear to be \"installed\". The `entry_points.txt` file will only include the namespaces requested on this field. Without this, stevedore would not be able to look up plugins in the setuptools `entry_points` metadata.\n\nNOTE: Each `python_distribution` must opt-in to being included in this repo-wide inference by tagging the namespaces with `stevedore_namespace(\"my.stevedore.extension\")`.\n\nThe stevedore namespace format (`my.stevedore.extension`) is similar to a Python namespace.",
-          "provider": "pants.backend.experimental.python.framework.stevedore",
+          "alias": "skip_flake8",
+          "default": "False",
+          "description": "If true, don't run Flake8 on this target's code.",
+          "provider": "pants.backend.python.lint.flake8",
           "required": false,
-          "type_hint": "Iterable[str] | None"
+          "type_hint": "bool"
         },
         {
-          "alias": "skip_pydocstyle",
+          "alias": "skip_isort",
           "default": "False",
-          "description": "If true, don't run pydocstyle on this target's code.",
-          "provider": "pants.backend.python.lint.pydocstyle",
+          "description": "If true, don't run isort on this target's code.",
+          "provider": "pants.backend.python.lint.isort",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_black",
+          "alias": "skip_ruff_check",
           "default": "False",
-          "description": "If true, don't run Black on this target's code.",
-          "provider": "pants.backend.python.lint.black",
+          "description": "If true, don't run the ruff checker on this target's code.",
+          "provider": "pants.backend.experimental.python.lint.ruff",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_pyupgrade",
+          "alias": "stevedore_namespaces",
+          "default": null,
+          "description": "List the stevedore namespaces required by this target.\n\nCode for all `entry_points` on `python_distribution` targets with these namespaces will be added as dependencies so that they are available on PYTHONPATH during tests. Note that this is only a subset of the `python_distribution`s dependencies, so the `entry_points` only need to be defined on one `python_distribution` even if the test only needs some of the `entry_points` namespaces on it.\n\nPlus, an `entry_points.txt` file will be generated in the sandbox so that each of the `python_distribution`s appear to be \"installed\". The `entry_points.txt` file will only include the namespaces requested on this field. Without this, stevedore would not be able to look up plugins in the setuptools `entry_points` metadata.\n\nNOTE: Each `python_distribution` must opt-in to being included in this repo-wide inference by tagging the namespaces with `stevedore_namespace(\"my.stevedore.extension\")`.\n\nThe stevedore namespace format (`my.stevedore.extension`) is similar to a Python namespace.",
+          "provider": "pants.backend.experimental.python.framework.stevedore",
+          "required": false,
+          "type_hint": "Iterable[str] | None"
+        },
+        {
+          "alias": "skip_autoflake",
           "default": "False",
-          "description": "If true, don't run pyupgrade on this target's code.",
-          "provider": "pants.backend.python.lint.pyupgrade",
+          "description": "If true, don't run Autoflake on this target's code.",
+          "provider": "pants.backend.python.lint.autoflake",
           "required": false,
           "type_hint": "bool"
         },
@@ -96321,68 +96322,60 @@
           "type_hint": "bool"
         },
         {
-          "alias": "go_generate_env_vars",
+          "alias": "golang_go_search_paths",
           "default": null,
-          "description": "Overrides the default value from the option `[go-generate].env_vars` when this environment target is active.",
+          "description": "Overrides the default value from the option `[golang].go_search_paths` when this environment target is active.",
           "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_cgo_fortran_flags",
+          "alias": "golang_cgo_c_flags",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].cgo_fortran_flags` when this environment target is active.",
+          "description": "Overrides the default value from the option `[golang].cgo_c_flags` when this environment target is active.",
           "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_cgo_linker_flags",
+          "alias": "go_generate_env_vars",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].cgo_linker_flags` when this environment target is active.",
+          "description": "Overrides the default value from the option `[go-generate].env_vars` when this environment target is active.",
           "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "pyenv_python_provider_installation_extra_env_vars",
-          "default": null,
-          "description": "Overrides the default value from the option `[pyenv-python-provider].installation_extra_env_vars` when this environment target is active.",
-          "provider": "pants.backend.python.providers.experimental.pyenv",
-          "required": false,
-          "type_hint": "Iterable[str] | None"
-        },
-        {
-          "alias": "golang_cgo_tool_search_paths",
+          "alias": "golang_cgo_fortran_binary_name",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].cgo_tool_search_paths` when this environment target is active.",
+          "description": "Overrides the default value from the option `[golang].cgo_fortran_binary_name` when this environment target is active.",
           "provider": "pants.backend.experimental.go",
           "required": false,
-          "type_hint": "Iterable[str] | None"
+          "type_hint": "str | None"
         },
         {
-          "alias": "nodejs_executable_search_paths",
+          "alias": "python_native_code_cpp_flags",
           "default": null,
-          "description": "Overrides the default value from the option `[nodejs].executable_search_paths` when this environment target is active.",
-          "provider": "pants.backend.experimental.javascript",
+          "description": "Overrides the default value from the option `[python-native-code].cpp_flags` when this environment target is active.",
+          "provider": "pants.core",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "python_bootstrap_names",
+          "alias": "test_extra_env_vars",
           "default": null,
-          "description": "Overrides the default value from the option `[python-bootstrap].names` when this environment target is active.",
+          "description": "Overrides the default value from the option `[test].extra_env_vars` when this environment target is active.",
           "provider": "pants.core",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_external_linker_binary_name",
+          "alias": "system_binaries_system_binary_paths",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].external_linker_binary_name` when this environment target is active.",
-          "provider": "pants.backend.experimental.go",
+          "description": "Overrides the default value from the option `[system-binaries].system_binary_paths` when this environment target is active.",
+          "provider": "pants.core",
           "required": false,
-          "type_hint": "str | None"
+          "type_hint": "Iterable[str] | None"
         },
         {
           "alias": "nodejs_corepack_env_vars",
@@ -96393,116 +96386,124 @@
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_cgo_gxx_binary_name",
+          "alias": "golang_cgo_gcc_binary_name",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].cgo_gxx_binary_name` when this environment target is active.",
+          "description": "Overrides the default value from the option `[golang].cgo_gcc_binary_name` when this environment target is active.",
           "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "str | None"
         },
         {
-          "alias": "jvm_global_options",
+          "alias": "shell_setup_executable_search_paths",
           "default": null,
-          "description": "Overrides the default value from the option `[jvm].global_options` when this environment target is active.",
-          "provider": "pants.backend.experimental.java",
+          "description": "Overrides the default value from the option `[shell-setup].executable_search_paths` when this environment target is active.",
+          "provider": "pants.backend.shell",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "python_native_code_cpp_flags",
+          "alias": "pex_executable_search_paths",
           "default": null,
-          "description": "Overrides the default value from the option `[python-native-code].cpp_flags` when this environment target is active.",
+          "description": "Overrides the default value from the option `[pex].executable_search_paths` when this environment target is active.",
           "provider": "pants.core",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "pex_executable_search_paths",
+          "alias": "golang_cgo_fortran_flags",
           "default": null,
-          "description": "Overrides the default value from the option `[pex].executable_search_paths` when this environment target is active.",
-          "provider": "pants.core",
+          "description": "Overrides the default value from the option `[golang].cgo_fortran_flags` when this environment target is active.",
+          "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "shell_setup_executable_search_paths",
+          "alias": "golang_cgo_linker_flags",
           "default": null,
-          "description": "Overrides the default value from the option `[shell-setup].executable_search_paths` when this environment target is active.",
-          "provider": "pants.backend.shell",
+          "description": "Overrides the default value from the option `[golang].cgo_linker_flags` when this environment target is active.",
+          "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "python_bootstrap_search_path",
+          "alias": "nodejs_executable_search_paths",
           "default": null,
-          "description": "Overrides the default value from the option `[python-bootstrap].search_path` when this environment target is active.",
-          "provider": "pants.core",
+          "description": "Overrides the default value from the option `[nodejs].executable_search_paths` when this environment target is active.",
+          "provider": "pants.backend.experimental.javascript",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "test_extra_env_vars",
+          "alias": "golang_subprocess_env_vars",
           "default": null,
-          "description": "Overrides the default value from the option `[test].extra_env_vars` when this environment target is active.",
-          "provider": "pants.core",
+          "description": "Overrides the default value from the option `[golang].subprocess_env_vars` when this environment target is active.",
+          "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_cgo_cxx_flags",
+          "alias": "pyenv_python_provider_installation_extra_env_vars",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].cgo_cxx_flags` when this environment target is active.",
-          "provider": "pants.backend.experimental.go",
+          "description": "Overrides the default value from the option `[pyenv-python-provider].installation_extra_env_vars` when this environment target is active.",
+          "provider": "pants.backend.python.providers.experimental.pyenv",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "apache_thrift_thrift_search_paths",
+          "alias": "nodejs_search_path",
           "default": null,
-          "description": "Overrides the default value from the option `[apache-thrift].thrift_search_paths` when this environment target is active.",
-          "provider": "pants.backend.codegen.thrift.apache.python",
+          "description": "Overrides the default value from the option `[nodejs].search_path` when this environment target is active.",
+          "provider": "pants.backend.experimental.javascript",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_cgo_gcc_binary_name",
+          "alias": "docker_env_vars",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].cgo_gcc_binary_name` when this environment target is active.",
-          "provider": "pants.backend.experimental.go",
+          "description": "Overrides the default value from the option `[docker].env_vars` when this environment target is active.",
+          "provider": "pants.backend.docker",
           "required": false,
-          "type_hint": "str | None"
+          "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "system_binaries_system_binary_paths",
+          "alias": "apache_thrift_thrift_search_paths",
           "default": null,
-          "description": "Overrides the default value from the option `[system-binaries].system_binary_paths` when this environment target is active.",
+          "description": "Overrides the default value from the option `[apache-thrift].thrift_search_paths` when this environment target is active.",
+          "provider": "pants.backend.codegen.thrift.apache.python",
+          "required": false,
+          "type_hint": "Iterable[str] | None"
+        },
+        {
+          "alias": "python_bootstrap_search_path",
+          "default": null,
+          "description": "Overrides the default value from the option `[python-bootstrap].search_path` when this environment target is active.",
           "provider": "pants.core",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_cgo_c_flags",
+          "alias": "golang_external_linker_binary_name",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].cgo_c_flags` when this environment target is active.",
+          "description": "Overrides the default value from the option `[golang].external_linker_binary_name` when this environment target is active.",
           "provider": "pants.backend.experimental.go",
           "required": false,
-          "type_hint": "Iterable[str] | None"
+          "type_hint": "str | None"
         },
         {
-          "alias": "nodejs_search_path",
+          "alias": "subprocess_environment_env_vars",
           "default": null,
-          "description": "Overrides the default value from the option `[nodejs].search_path` when this environment target is active.",
-          "provider": "pants.backend.experimental.javascript",
+          "description": "Overrides the default value from the option `[subprocess-environment].env_vars` when this environment target is active.",
+          "provider": "pants.core",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_cgo_fortran_binary_name",
+          "alias": "python_native_code_ld_flags",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].cgo_fortran_binary_name` when this environment target is active.",
-          "provider": "pants.backend.experimental.go",
+          "description": "Overrides the default value from the option `[python-native-code].ld_flags` when this environment target is active.",
+          "provider": "pants.core",
           "required": false,
-          "type_hint": "str | None"
+          "type_hint": "Iterable[str] | None"
         },
         {
           "alias": "docker_executable_search_paths",
@@ -96513,41 +96514,41 @@
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_subprocess_env_vars",
+          "alias": "golang_cgo_gxx_binary_name",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].subprocess_env_vars` when this environment target is active.",
+          "description": "Overrides the default value from the option `[golang].cgo_gxx_binary_name` when this environment target is active.",
           "provider": "pants.backend.experimental.go",
           "required": false,
-          "type_hint": "Iterable[str] | None"
+          "type_hint": "str | None"
         },
         {
-          "alias": "python_native_code_ld_flags",
+          "alias": "jvm_global_options",
           "default": null,
-          "description": "Overrides the default value from the option `[python-native-code].ld_flags` when this environment target is active.",
-          "provider": "pants.core",
+          "description": "Overrides the default value from the option `[jvm].global_options` when this environment target is active.",
+          "provider": "pants.backend.experimental.java",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "docker_env_vars",
+          "alias": "python_bootstrap_names",
           "default": null,
-          "description": "Overrides the default value from the option `[docker].env_vars` when this environment target is active.",
-          "provider": "pants.backend.docker",
+          "description": "Overrides the default value from the option `[python-bootstrap].names` when this environment target is active.",
+          "provider": "pants.core",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "subprocess_environment_env_vars",
+          "alias": "golang_cgo_tool_search_paths",
           "default": null,
-          "description": "Overrides the default value from the option `[subprocess-environment].env_vars` when this environment target is active.",
-          "provider": "pants.core",
+          "description": "Overrides the default value from the option `[golang].cgo_tool_search_paths` when this environment target is active.",
+          "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "Iterable[str] | None"
         },
         {
-          "alias": "golang_go_search_paths",
+          "alias": "golang_cgo_cxx_flags",
           "default": null,
-          "description": "Overrides the default value from the option `[golang].go_search_paths` when this environment target is active.",
+          "description": "Overrides the default value from the option `[golang].cgo_cxx_flags` when this environment target is active.",
           "provider": "pants.backend.experimental.go",
           "required": false,
           "type_hint": "Iterable[str] | None"
@@ -96787,7 +96788,7 @@
         {
           "alias": "packages",
           "default": null,
-          "description": "The JVM packages this artifact provides for the purposes of dependency inference.\n\nFor example, the JVM artifact `junit:junit` might provide `[\"org.junit.**\"]`.\n\nUsually you can leave this field off. If unspecified, Pants will fall back to the `[java-infer].third_party_import_mapping`, then to a built in mapping (https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/jvm/dependency_inference/jvm_artifact_mappings.py), and then finally it will default to the normalized `group` of the artifact. For example, in the absence of any other mapping the artifact `io.confluent:common-config` would default to providing `[\"io.confluent.**\"]`.\n\nThe package path may be made recursive to match symbols in subpackages by adding `.**` to the end of the package path. For example, specify `[\"org.junit.**\"]` to infer a dependency on the artifact for any file importing a symbol from `org.junit` or its subpackages.",
+          "description": "The JVM packages this artifact provides for the purposes of dependency inference.\n\nFor example, the JVM artifact `junit:junit` might provide `[\"org.junit.**\"]`.\n\nUsually you can leave this field off. If unspecified, Pants will fall back to the `[java-infer].third_party_import_mapping`, then to a built in mapping (https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/jvm/dependency_inference/jvm_artifact_mappings.py), and then finally it will default to the normalized `group` of the artifact. For example, in the absence of any other mapping the artifact `io.confluent:common-config` would default to providing `[\"io.confluent.**\"]`.\n\nThe package path may be made recursive to match symbols in subpackages by adding `.**` to the end of the package path. For example, specify `[\"org.junit.**\"]` to infer a dependency on the artifact for any file importing a symbol from `org.junit` or its subpackages.",
           "provider": "",
           "required": false,
           "type_hint": "Iterable[str] | None"
@@ -96937,18 +96938,18 @@
           "type_hint": "str | None"
         },
         {
-          "alias": "skip_scalafix",
+          "alias": "skip_scalafmt",
           "default": "False",
-          "description": "If true, don't run `scalafix` on this target's code.",
-          "provider": "pants.backend.experimental.scala.lint.scalafix",
+          "description": "If true, don't run `scalafmt` on this target's code.",
+          "provider": "pants.backend.experimental.scala.lint.scalafmt",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_scalafmt",
+          "alias": "skip_scalafix",
           "default": "False",
-          "description": "If true, don't run `scalafmt` on this target's code.",
-          "provider": "pants.backend.experimental.scala.lint.scalafmt",
+          "description": "If true, don't run `scalafix` on this target's code.",
+          "provider": "pants.backend.experimental.scala.lint.scalafix",
           "required": false,
           "type_hint": "bool"
         }
@@ -97001,18 +97002,18 @@
           "type_hint": "int | None"
         },
         {
-          "alias": "skip_scalafix",
+          "alias": "skip_scalafmt",
           "default": "False",
-          "description": "If true, don't run `scalafix` on this target's code.",
-          "provider": "pants.backend.experimental.scala.lint.scalafix",
+          "description": "If true, don't run `scalafmt` on this target's code.",
+          "provider": "pants.backend.experimental.scala.lint.scalafmt",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_scalafmt",
+          "alias": "skip_scalafix",
           "default": "False",
-          "description": "If true, don't run `scalafmt` on this target's code.",
-          "provider": "pants.backend.experimental.scala.lint.scalafmt",
+          "description": "If true, don't run `scalafix` on this target's code.",
+          "provider": "pants.backend.experimental.scala.lint.scalafix",
           "required": false,
           "type_hint": "bool"
         },
@@ -97153,18 +97154,18 @@
           "type_hint": "str | None"
         },
         {
-          "alias": "skip_scalafix",
+          "alias": "skip_scalafmt",
           "default": "False",
-          "description": "If true, don't run `scalafix` on this target's code.",
-          "provider": "pants.backend.experimental.scala.lint.scalafix",
+          "description": "If true, don't run `scalafmt` on this target's code.",
+          "provider": "pants.backend.experimental.scala.lint.scalafmt",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_scalafmt",
+          "alias": "skip_scalafix",
           "default": "False",
-          "description": "If true, don't run `scalafmt` on this target's code.",
-          "provider": "pants.backend.experimental.scala.lint.scalafmt",
+          "description": "If true, don't run `scalafix` on this target's code.",
+          "provider": "pants.backend.experimental.scala.lint.scalafix",
           "required": false,
           "type_hint": "bool"
         }
@@ -97209,18 +97210,18 @@
           "type_hint": "Dict[Union[str, Tuple[str, ...]], Dict[str, Any]] | None"
         },
         {
-          "alias": "skip_scalafix",
+          "alias": "skip_scalafmt",
           "default": "False",
-          "description": "If true, don't run `scalafix` on this target's code.",
-          "provider": "pants.backend.experimental.scala.lint.scalafix",
+          "description": "If true, don't run `scalafmt` on this target's code.",
+          "provider": "pants.backend.experimental.scala.lint.scalafmt",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_scalafmt",
+          "alias": "skip_scalafix",
           "default": "False",
-          "description": "If true, don't run `scalafmt` on this target's code.",
-          "provider": "pants.backend.experimental.scala.lint.scalafmt",
+          "description": "If true, don't run `scalafix` on this target's code.",
+          "provider": "pants.backend.experimental.scala.lint.scalafix",
           "required": false,
           "type_hint": "bool"
         },
@@ -97401,18 +97402,18 @@
           "type_hint": "str | None"
         },
         {
-          "alias": "skip_scalafix",
+          "alias": "skip_scalafmt",
           "default": "False",
-          "description": "If true, don't run `scalafix` on this target's code.",
-          "provider": "pants.backend.experimental.scala.lint.scalafix",
+          "description": "If true, don't run `scalafmt` on this target's code.",
+          "provider": "pants.backend.experimental.scala.lint.scalafmt",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_scalafmt",
+          "alias": "skip_scalafix",
           "default": "False",
-          "description": "If true, don't run `scalafmt` on this target's code.",
-          "provider": "pants.backend.experimental.scala.lint.scalafmt",
+          "description": "If true, don't run `scalafix` on this target's code.",
+          "provider": "pants.backend.experimental.scala.lint.scalafix",
           "required": false,
           "type_hint": "bool"
         }
@@ -97457,18 +97458,18 @@
           "type_hint": "Dict[Union[str, Tuple[str, ...]], Dict[str, Any]] | None"
         },
         {
-          "alias": "skip_scalafix",
+          "alias": "skip_scalafmt",
           "default": "False",
-          "description": "If true, don't run `scalafix` on this target's code.",
-          "provider": "pants.backend.experimental.scala.lint.scalafix",
+          "description": "If true, don't run `scalafmt` on this target's code.",
+          "provider": "pants.backend.experimental.scala.lint.scalafmt",
           "required": false,
           "type_hint": "bool"
         },
         {
-          "alias": "skip_scalafmt",
+          "alias": "skip_scalafix",
           "default": "False",
-          "description": "If true, don't run `scalafmt` on this target's code.",
-          "provider": "pants.backend.experimental.scala.lint.scalafmt",
+          "description": "If true, don't run `scalafix` on this target's code.",
+          "provider": "pants.backend.experimental.scala.lint.scalafix",
           "required": false,
           "type_hint": "bool"
         },
@@ -98352,14 +98353,6 @@
           "required": true,
           "type_hint": "str"
         },
-        {
-          "alias": "finagle",
-          "default": "False",
-          "description": "If True, then also generate Finagle classes for services when using Scrooge as the Thrift generator.",
-          "provider": "pants.backend.experimental.codegen.thrift.scrooge.java",
-          "required": false,
-          "type_hint": "bool"
-        },
         {
           "alias": "jvm_resolve",
           "default": null,
@@ -98369,18 +98362,26 @@
           "type_hint": "str | None"
         },
         {
-          "alias": "jvm_jdk",
+          "alias": "python_resolve",
           "default": null,
-          "description": "The major version of the JDK that this target should be built with. If not defined, will default to `[jvm].default_source_jdk`.",
-          "provider": "pants.backend.experimental.codegen.thrift.apache.java",
+          "description": "The resolve from `[python].resolves` to use.\n\nIf not defined, will default to `[python].default_resolve`.\n\nAll dependencies must share the same value for their `resolve` field.",
+          "provider": "pants.backend.codegen.thrift.apache.python",
           "required": false,
           "type_hint": "str | None"
         },
         {
-          "alias": "python_resolve",
+          "alias": "finagle",
+          "default": "False",
+          "description": "If True, then also generate Finagle classes for services when using Scrooge as the Thrift generator.",
+          "provider": "pants.backend.experimental.codegen.thrift.scrooge.java",
+          "required": false,
+          "type_hint": "bool"
+        },
+        {
+          "alias": "jvm_jdk",
           "default": null,
-          "description": "The resolve from `[python].resolves` to use.\n\nIf not defined, will default to `[python].default_resolve`.\n\nAll dependencies must share the same value for their `resolve` field.",
-          "provider": "pants.backend.codegen.thrift.apache.python",
+          "description": "The major version of the JDK that this target should be built with. If not defined, will default to `[jvm].default_source_jdk`.",
+          "provider": "pants.backend.experimental.codegen.thrift.apache.java",
           "required": false,
           "type_hint": "str | None"
         }
@@ -98424,14 +98425,6 @@
           "required": false,
           "type_hint": "Dict[Union[str, Tuple[str, ...]], Dict[str, Any]] | None"
         },
-        {
-          "alias": "finagle",
-          "default": "False",
-          "description": "If True, then also generate Finagle classes for services when using Scrooge as the Thrift generator.",
-          "provider": "pants.backend.experimental.codegen.thrift.scrooge.java",
-          "required": false,
-          "type_hint": "bool"
-        },
         {
           "alias": "jvm_resolve",
           "default": null,
@@ -98441,18 +98434,26 @@
           "type_hint": "str | None"
         },
         {
-          "alias": "jvm_jdk",
+          "alias": "python_resolve",
           "default": null,
-          "description": "The major version of the JDK that this target should be built with. If not defined, will default to `[jvm].default_source_jdk`.",
-          "provider": "pants.backend.experimental.codegen.thrift.apache.java",
+          "description": "The resolve from `[python].resolves` to use.\n\nIf not defined, will default to `[python].default_resolve`.\n\nAll dependencies must share the same value for their `resolve` field.",
+          "provider": "pants.backend.codegen.thrift.apache.python",
           "required": false,
           "type_hint": "str | None"
         },
         {
-          "alias": "python_resolve",
+          "alias": "finagle",
+          "default": "False",
+          "description": "If True, then also generate Finagle classes for services when using Scrooge as the Thrift generator.",
+          "provider": "pants.backend.experimental.codegen.thrift.scrooge.java",
+          "required": false,
+          "type_hint": "bool"
+        },
+        {
+          "alias": "jvm_jdk",
           "default": null,
-          "description": "The resolve from `[python].resolves` to use.\n\nIf not defined, will default to `[python].default_resolve`.\n\nAll dependencies must share the same value for their `resolve` field.",
-          "provider": "pants.backend.codegen.thrift.apache.python",
+          "description": "The major version of the JDK that this target should be built with. If not defined, will default to `[jvm].default_source_jdk`.",
+          "provider": "pants.backend.experimental.codegen.thrift.apache.java",
           "required": false,
           "type_hint": "str | None"
         },
@@ -99179,12 +99180,12 @@
               {
                 "details": null,
                 "rank": "HARDCODED",
-                "value": "2.21.2rc1"
+                "value": "2.21.2rc2"
               },
               {
                 "details": "from env var PANTS_VERSION",
                 "rank": "ENVIRONMENT",
-                "value": "2.21.2rc1"
+                "value": "2.21.2rc2"
               }
             ]
           }
@@ -100922,7 +100923,7 @@
                 "details": "",
                 "rank": "HARDCODED",
                 "value": {
-                  "user-agent": "pants/2.21.2rc1"
+                  "user-agent": "pants/2.21.2rc2"
                 }
               }
             ]
@@ -101314,7 +101315,7 @@
                 "details": "",
                 "rank": "HARDCODED",
                 "value": {
-                  "user-agent": "pants/2.21.2rc1"
+                  "user-agent": "pants/2.21.2rc2"
                 }
               }
             ]
@@ -114282,7 +114283,7 @@
           ],
           "env_var": "PANTS_GOOGLE_JAVA_FORMAT_LOCKFILE",
           "fromfile": false,
-          "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/java/lint/google_java_format/google_java_format.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=google-java-format`.",
+          "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/java/lint/google_java_format/google_java_format.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=google-java-format`.",
           "removal_hint": null,
           "removal_version": null,
           "scoped_cmd_line_args": [
@@ -116966,7 +116967,7 @@
           ],
           "env_var": "PANTS_JARJAR_LOCKFILE",
           "fromfile": false,
-          "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/jvm/shading/jarjar.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=jarjar`.",
+          "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/jvm/shading/jarjar.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=jarjar`.",
           "removal_hint": null,
           "removal_version": null,
           "scoped_cmd_line_args": [
@@ -117218,7 +117219,7 @@
           ],
           "env_var": "PANTS_JAVA_AVRO_LOCKFILE",
           "fromfile": false,
-          "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/codegen/avro/java/avro-tools.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=java-avro`.",
+          "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/codegen/avro/java/avro-tools.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=java-avro`.",
           "removal_hint": null,
           "removal_version": null,
           "scoped_cmd_line_args": [
@@ -117677,7 +117678,7 @@
           ],
           "env_var": "PANTS_JUNIT_LOCKFILE",
           "fromfile": false,
-          "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/jvm/test/junit.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=junit`.",
+          "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/jvm/test/junit.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=junit`.",
           "removal_hint": null,
           "removal_version": null,
           "scoped_cmd_line_args": [
@@ -118554,7 +118555,7 @@
           ],
           "env_var": "PANTS_KTLINT_LOCKFILE",
           "fromfile": false,
-          "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/kotlin/lint/ktlint/ktlint.lock for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=ktlint`.",
+          "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/kotlin/lint/ktlint/ktlint.lock for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=ktlint`.",
           "removal_hint": null,
           "removal_version": null,
           "scoped_cmd_line_args": [
@@ -120948,7 +120949,7 @@
           ],
           "env_var": "PANTS_OPENAPI_GENERATOR_LOCKFILE",
           "fromfile": false,
-          "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/openapi/subsystems/openapi_generator.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=openapi-generator`.",
+          "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/openapi/subsystems/openapi_generator.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=openapi-generator`.",
           "removal_hint": null,
           "removal_version": null,
           "scoped_cmd_line_args": [
@@ -122155,7 +122156,7 @@
           ],
           "env_var": "PANTS_PROTOBUF_JAVA_GRPC_LOCKFILE",
           "fromfile": false,
-          "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/codegen/protobuf/java/grpc-java.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=protobuf-java-grpc`.",
+          "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/codegen/protobuf/java/grpc-java.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=protobuf-java-grpc`.",
           "removal_hint": null,
           "removal_version": null,
           "scoped_cmd_line_args": [
@@ -128965,7 +128966,7 @@
           ],
           "env_var": "PANTS_SCALAFIX_LOCKFILE",
           "fromfile": false,
-          "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/scala/lint/scalafix/scalafix.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scalafix`.",
+          "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/scala/lint/scalafix/scalafix.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scalafix`.",
           "removal_hint": null,
           "removal_version": null,
           "scoped_cmd_line_args": [
@@ -129340,7 +129341,7 @@
           ],
           "env_var": "PANTS_SCALAFMT_LOCKFILE",
           "fromfile": false,
-          "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/scala/lint/scalafmt/scalafmt.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scalafmt`.",
+          "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/scala/lint/scalafmt/scalafmt.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scalafmt`.",
           "removal_hint": null,
           "removal_version": null,
           "scoped_cmd_line_args": [
@@ -129635,7 +129636,7 @@
           ],
           "env_var": "PANTS_SCALAPB_LOCKFILE",
           "fromfile": false,
-          "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/codegen/protobuf/scala/scalapbc.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scalapb`.",
+          "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/codegen/protobuf/scala/scalapbc.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scalapb`.",
           "removal_hint": null,
           "removal_version": null,
           "scoped_cmd_line_args": [
@@ -129846,7 +129847,7 @@
           ],
           "env_var": "PANTS_SCALATEST_LOCKFILE",
           "fromfile": false,
-          "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/scala/subsystems/scalatest.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scalatest`.",
+          "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/scala/subsystems/scalatest.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scalatest`.",
           "removal_hint": null,
           "removal_version": null,
           "scoped_cmd_line_args": [
@@ -130369,7 +130370,7 @@
           ],
           "env_var": "PANTS_SCROOGE_LOCKFILE",
           "fromfile": false,
-          "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/codegen/thrift/scrooge/scrooge.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scrooge`.",
+          "help": "Path to a lockfile used for installing the tool.\n\nSet to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/codegen/thrift/scrooge/scrooge.default.lockfile.txt for the default lockfile contents.\n\nTo use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scrooge`.",
           "removal_hint": null,
           "removal_version": null,
           "scoped_cmd_line_args": [
diff --git a/versioned_docs/version-2.21/reference/subsystems/google-java-format.mdx b/versioned_docs/version-2.21/reference/subsystems/google-java-format.mdx
index 06c8a335..17ffd43d 100644
--- a/versioned_docs/version-2.21/reference/subsystems/google-java-format.mdx
+++ b/versioned_docs/version-2.21/reference/subsystems/google-java-format.mdx
@@ -99,7 +99,7 @@ lockfile = <str>`}
 
 Path to a lockfile used for installing the tool.
 
-Set to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/java/lint/google_java_format/google_java_format.default.lockfile.txt for the default lockfile contents.
+Set to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/java/lint/google_java_format/google_java_format.default.lockfile.txt for the default lockfile contents.
 
 To use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=google-java-format`.
 
diff --git a/versioned_docs/version-2.21/reference/subsystems/jarjar.mdx b/versioned_docs/version-2.21/reference/subsystems/jarjar.mdx
index 1fe4ceeb..ddc21853 100644
--- a/versioned_docs/version-2.21/reference/subsystems/jarjar.mdx
+++ b/versioned_docs/version-2.21/reference/subsystems/jarjar.mdx
@@ -100,7 +100,7 @@ lockfile = <str>`}
 
 Path to a lockfile used for installing the tool.
 
-Set to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/jvm/shading/jarjar.default.lockfile.txt for the default lockfile contents.
+Set to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/jvm/shading/jarjar.default.lockfile.txt for the default lockfile contents.
 
 To use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=jarjar`.
 
diff --git a/versioned_docs/version-2.21/reference/subsystems/java-avro.mdx b/versioned_docs/version-2.21/reference/subsystems/java-avro.mdx
index 7083eb0e..29864c80 100644
--- a/versioned_docs/version-2.21/reference/subsystems/java-avro.mdx
+++ b/versioned_docs/version-2.21/reference/subsystems/java-avro.mdx
@@ -73,7 +73,7 @@ lockfile = <str>`}
 
 Path to a lockfile used for installing the tool.
 
-Set to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/codegen/avro/java/avro-tools.default.lockfile.txt for the default lockfile contents.
+Set to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/codegen/avro/java/avro-tools.default.lockfile.txt for the default lockfile contents.
 
 To use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=java-avro`.
 
diff --git a/versioned_docs/version-2.21/reference/subsystems/junit.mdx b/versioned_docs/version-2.21/reference/subsystems/junit.mdx
index 0fe2d74a..e4f45f0a 100644
--- a/versioned_docs/version-2.21/reference/subsystems/junit.mdx
+++ b/versioned_docs/version-2.21/reference/subsystems/junit.mdx
@@ -103,7 +103,7 @@ lockfile = <str>`}
 
 Path to a lockfile used for installing the tool.
 
-Set to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/jvm/test/junit.default.lockfile.txt for the default lockfile contents.
+Set to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/jvm/test/junit.default.lockfile.txt for the default lockfile contents.
 
 To use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=junit`.
 
diff --git a/versioned_docs/version-2.21/reference/subsystems/ktlint.mdx b/versioned_docs/version-2.21/reference/subsystems/ktlint.mdx
index ff4e6c42..1b89e4db 100644
--- a/versioned_docs/version-2.21/reference/subsystems/ktlint.mdx
+++ b/versioned_docs/version-2.21/reference/subsystems/ktlint.mdx
@@ -85,7 +85,7 @@ lockfile = <str>`}
 
 Path to a lockfile used for installing the tool.
 
-Set to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/kotlin/lint/ktlint/ktlint.lock for the default lockfile contents.
+Set to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/kotlin/lint/ktlint/ktlint.lock for the default lockfile contents.
 
 To use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=ktlint`.
 
diff --git a/versioned_docs/version-2.21/reference/subsystems/openapi-generator.mdx b/versioned_docs/version-2.21/reference/subsystems/openapi-generator.mdx
index ff6276ea..5f97e1f6 100644
--- a/versioned_docs/version-2.21/reference/subsystems/openapi-generator.mdx
+++ b/versioned_docs/version-2.21/reference/subsystems/openapi-generator.mdx
@@ -73,7 +73,7 @@ lockfile = <str>`}
 
 Path to a lockfile used for installing the tool.
 
-Set to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/openapi/subsystems/openapi_generator.default.lockfile.txt for the default lockfile contents.
+Set to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/openapi/subsystems/openapi_generator.default.lockfile.txt for the default lockfile contents.
 
 To use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=openapi-generator`.
 
diff --git a/versioned_docs/version-2.21/reference/subsystems/protobuf-java-grpc.mdx b/versioned_docs/version-2.21/reference/subsystems/protobuf-java-grpc.mdx
index c4c7d5a9..4b132f68 100644
--- a/versioned_docs/version-2.21/reference/subsystems/protobuf-java-grpc.mdx
+++ b/versioned_docs/version-2.21/reference/subsystems/protobuf-java-grpc.mdx
@@ -73,7 +73,7 @@ lockfile = <str>`}
 
 Path to a lockfile used for installing the tool.
 
-Set to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/codegen/protobuf/java/grpc-java.default.lockfile.txt for the default lockfile contents.
+Set to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/codegen/protobuf/java/grpc-java.default.lockfile.txt for the default lockfile contents.
 
 To use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=protobuf-java-grpc`.
 
diff --git a/versioned_docs/version-2.21/reference/subsystems/scalafix.mdx b/versioned_docs/version-2.21/reference/subsystems/scalafix.mdx
index e7e0619f..3faec2d8 100644
--- a/versioned_docs/version-2.21/reference/subsystems/scalafix.mdx
+++ b/versioned_docs/version-2.21/reference/subsystems/scalafix.mdx
@@ -99,7 +99,7 @@ lockfile = <str>`}
 
 Path to a lockfile used for installing the tool.
 
-Set to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/scala/lint/scalafix/scalafix.default.lockfile.txt for the default lockfile contents.
+Set to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/scala/lint/scalafix/scalafix.default.lockfile.txt for the default lockfile contents.
 
 To use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scalafix`.
 
diff --git a/versioned_docs/version-2.21/reference/subsystems/scalafmt.mdx b/versioned_docs/version-2.21/reference/subsystems/scalafmt.mdx
index 463d55a3..ef35cd8a 100644
--- a/versioned_docs/version-2.21/reference/subsystems/scalafmt.mdx
+++ b/versioned_docs/version-2.21/reference/subsystems/scalafmt.mdx
@@ -99,7 +99,7 @@ lockfile = <str>`}
 
 Path to a lockfile used for installing the tool.
 
-Set to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/scala/lint/scalafmt/scalafmt.default.lockfile.txt for the default lockfile contents.
+Set to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/scala/lint/scalafmt/scalafmt.default.lockfile.txt for the default lockfile contents.
 
 To use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scalafmt`.
 
diff --git a/versioned_docs/version-2.21/reference/subsystems/scalapb.mdx b/versioned_docs/version-2.21/reference/subsystems/scalapb.mdx
index c9a4cd26..518e431b 100644
--- a/versioned_docs/version-2.21/reference/subsystems/scalapb.mdx
+++ b/versioned_docs/version-2.21/reference/subsystems/scalapb.mdx
@@ -91,7 +91,7 @@ lockfile = <str>`}
 
 Path to a lockfile used for installing the tool.
 
-Set to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/codegen/protobuf/scala/scalapbc.default.lockfile.txt for the default lockfile contents.
+Set to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/codegen/protobuf/scala/scalapbc.default.lockfile.txt for the default lockfile contents.
 
 To use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scalapb`.
 
diff --git a/versioned_docs/version-2.21/reference/subsystems/scalatest.mdx b/versioned_docs/version-2.21/reference/subsystems/scalatest.mdx
index 8dcdf1a9..89d18aa8 100644
--- a/versioned_docs/version-2.21/reference/subsystems/scalatest.mdx
+++ b/versioned_docs/version-2.21/reference/subsystems/scalatest.mdx
@@ -105,7 +105,7 @@ lockfile = <str>`}
 
 Path to a lockfile used for installing the tool.
 
-Set to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/scala/subsystems/scalatest.default.lockfile.txt for the default lockfile contents.
+Set to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/scala/subsystems/scalatest.default.lockfile.txt for the default lockfile contents.
 
 To use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scalatest`.
 
diff --git a/versioned_docs/version-2.21/reference/subsystems/scrooge.mdx b/versioned_docs/version-2.21/reference/subsystems/scrooge.mdx
index 6a48990f..4375ffde 100644
--- a/versioned_docs/version-2.21/reference/subsystems/scrooge.mdx
+++ b/versioned_docs/version-2.21/reference/subsystems/scrooge.mdx
@@ -73,7 +73,7 @@ lockfile = <str>`}
 
 Path to a lockfile used for installing the tool.
 
-Set to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/codegen/thrift/scrooge/scrooge.default.lockfile.txt for the default lockfile contents.
+Set to the string `<default>` to use a lockfile provided by Pants, so long as you have not changed the `--version` option. See https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/codegen/thrift/scrooge/scrooge.default.lockfile.txt for the default lockfile contents.
 
 To use a custom lockfile, set this option to a file path relative to the build root, then run `pants jvm-generate-lockfiles --resolve=scrooge`.
 
diff --git a/versioned_docs/version-2.21/reference/targets/jvm_artifact.mdx b/versioned_docs/version-2.21/reference/targets/jvm_artifact.mdx
index 3b4315b3..c14a5e3d 100644
--- a/versioned_docs/version-2.21/reference/targets/jvm_artifact.mdx
+++ b/versioned_docs/version-2.21/reference/targets/jvm_artifact.mdx
@@ -148,7 +148,7 @@ The JVM packages this artifact provides for the purposes of dependency inference
 
 For example, the JVM artifact `junit:junit` might provide `["org.junit.**"]`.
 
-Usually you can leave this field off. If unspecified, Pants will fall back to the `[java-infer].third_party_import_mapping`, then to a built in mapping (https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/jvm/dependency_inference/jvm_artifact_mappings.py), and then finally it will default to the normalized `group` of the artifact. For example, in the absence of any other mapping the artifact `io.confluent:common-config` would default to providing `["io.confluent.**"]`.
+Usually you can leave this field off. If unspecified, Pants will fall back to the `[java-infer].third_party_import_mapping`, then to a built in mapping (https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/jvm/dependency_inference/jvm_artifact_mappings.py), and then finally it will default to the normalized `group` of the artifact. For example, in the absence of any other mapping the artifact `io.confluent:common-config` would default to providing `["io.confluent.**"]`.
 
 The package path may be made recursive to match symbols in subpackages by adding `.**` to the end of the package path. For example, specify `["org.junit.**"]` to infer a dependency on the artifact for any file importing a symbol from `org.junit` or its subpackages.
 
diff --git a/versioned_docs/version-2.21/reference/targets/pants_requirements.mdx b/versioned_docs/version-2.21/reference/targets/pants_requirements.mdx
index 819454d1..4ed12440 100644
--- a/versioned_docs/version-2.21/reference/targets/pants_requirements.mdx
+++ b/versioned_docs/version-2.21/reference/targets/pants_requirements.mdx
@@ -79,7 +79,7 @@ If true, include `pantsbuild.pants.testutil` to write tests for your plugin.
 
 <Field
     type_repr={`str | None`}
-    default_repr={`'== 2.21.2rc1'`}
+    default_repr={`'== 2.21.2rc2'`}
 >
 
 The PEP 440 version specifier version of Pants to target. E.g. `== 2.15.*`, or `>= 2.16.0, < 2.17.0`
diff --git a/versioned_docs/version-2.21/reference/targets/python_requirement.mdx b/versioned_docs/version-2.21/reference/targets/python_requirement.mdx
index 8d0c8103..54017c63 100644
--- a/versioned_docs/version-2.21/reference/targets/python_requirement.mdx
+++ b/versioned_docs/version-2.21/reference/targets/python_requirement.mdx
@@ -96,7 +96,7 @@ The modules this requirement provides (used for dependency inference).
 
 For example, the requirement `setuptools` provides `["setuptools", "pkg_resources", "easy_install"]`.
 
-Usually you can leave this field off. If unspecified, Pants will first look at the default module mapping (https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/python/dependency_inference/default_module_mapping.py), and then will default to the normalized project name. For example, the requirement `Django` would default to the module `django`.
+Usually you can leave this field off. If unspecified, Pants will first look at the default module mapping (https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/python/dependency_inference/default_module_mapping.py), and then will default to the normalized project name. For example, the requirement `Django` would default to the module `django`.
 
 Mutually exclusive with the `type_stub_modules` field.
 
@@ -141,7 +141,7 @@ The modules this requirement provides if the requirement is a type stub (used fo
 
 For example, the requirement `types-requests` provides `["requests"]`.
 
-Usually you can leave this field off. If unspecified, Pants will first look at the default module mapping (https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/backend/python/dependency_inference/default_module_mapping.py). If not found _and_ the requirement name starts with `types-` or `stubs-`, or ends with `-types` or `-stubs`, will default to that requirement name without the prefix/suffix. For example, `types-requests` would default to `requests`. Otherwise, will be treated like a normal requirement (see the `modules` field).
+Usually you can leave this field off. If unspecified, Pants will first look at the default module mapping (https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/backend/python/dependency_inference/default_module_mapping.py). If not found _and_ the requirement name starts with `types-` or `stubs-`, or ends with `-types` or `-stubs`, will default to that requirement name without the prefix/suffix. For example, `types-requests` would default to `requests`. Otherwise, will be treated like a normal requirement (see the `modules` field).
 
 Mutually exclusive with the `modules` field.
 
diff --git a/versioned_docs/version-2.21/reference/targets/scala_artifact.mdx b/versioned_docs/version-2.21/reference/targets/scala_artifact.mdx
index 85fa8606..b49fd4e1 100644
--- a/versioned_docs/version-2.21/reference/targets/scala_artifact.mdx
+++ b/versioned_docs/version-2.21/reference/targets/scala_artifact.mdx
@@ -151,7 +151,7 @@ The JVM packages this artifact provides for the purposes of dependency inference
 
 For example, the JVM artifact `junit:junit` might provide `["org.junit.**"]`.
 
-Usually you can leave this field off. If unspecified, Pants will fall back to the `[java-infer].third_party_import_mapping`, then to a built in mapping (https://github.com/pantsbuild/pants/blob/release_2.21.2rc1/src/python/pants/jvm/dependency_inference/jvm_artifact_mappings.py), and then finally it will default to the normalized `group` of the artifact. For example, in the absence of any other mapping the artifact `io.confluent:common-config` would default to providing `["io.confluent.**"]`.
+Usually you can leave this field off. If unspecified, Pants will fall back to the `[java-infer].third_party_import_mapping`, then to a built in mapping (https://github.com/pantsbuild/pants/blob/release_2.21.2rc2/src/python/pants/jvm/dependency_inference/jvm_artifact_mappings.py), and then finally it will default to the normalized `group` of the artifact. For example, in the absence of any other mapping the artifact `io.confluent:common-config` would default to providing `["io.confluent.**"]`.
 
 The package path may be made recursive to match symbols in subpackages by adding `.**` to the end of the package path. For example, specify `["org.junit.**"]` to infer a dependency on the artifact for any file importing a symbol from `org.junit` or its subpackages.