Use Bazel 7.3.1 and flip --incompatible_use_plus_in_repo_names

.bazelrc

@@ -1,4 +1,5 @@
 common --enable_platform_specific_config
+common --incompatible_use_plus_in_repo_names
 
 # Shared configuration flags to build and test Bazel on RBE.
 build:remote_shared --remote_instance_name=projects/bazel-untrusted/instances/default_instance

.bazelversion

@@ -1 +1 @@
-7.3.0
+7.3.1

BUILD

@@ -214,10 +214,8 @@ pkg_tar(
     srcs = ["@maven//:srcs"] + ["MAVEN_CANONICAL_REPO_NAME"],
     package_dir = "derived/maven",
     remap_paths = {
-        # We need the repo names according to "builder bazel" (instead of "bazel being built") here.
-        # Remove the `replace` parts after building with 7.3.0.
-        "external/" + get_canonical_repo_name("@maven").replace("+", "~") + "/": "",
-        "../" + get_canonical_repo_name("@maven").replace("+", "~") + "/": "",
+        "external/" + get_canonical_repo_name("@maven") + "/": "",
+        "../" + get_canonical_repo_name("@maven") + "/": "",
     },
     strip_prefix = ".",
     visibility = ["//:__subpackages__"],

MODULE.bazel

@@ -62,6 +62,12 @@ single_version_override(
     ],
 )
 
+single_version_override(
+    module_name = "protobuf",
+    patch_strip = 1,
+    patches = ["//third_party:protobuf_21.7.patch"],
+)
+
 # The following Bazel modules are not direct dependencies for building Bazel,
 # but are required for visibility from DIST_ARCHIVE_REPOS in repositories.bzl
 bazel_dep(name = "apple_support", version = "1.8.1")
@@ -356,9 +362,9 @@ bazel_dep(name = "bazel_ci_rules", version = "1.0.0")
 bazel_test_deps = use_extension("//:extensions.bzl", "bazel_test_deps")
 use_repo(
     bazel_test_deps,
+    "kythe_release",
     "local_bazel_source_list",
     "local_config_winsdk",
-    "kythe_release",
 )
 
 bazel_rbe_deps = use_extension("//:rbe_extension.bzl", "bazel_rbe_deps")