Make sure the update-dependencies script runs cleanly

MODULE.bazel

@@ -239,6 +239,7 @@ dev_maven.install(
     ],
     fail_if_repin_required = True,
     fetch_sources = True,
+    lock_file = "//:contrib_rules_jvm_tests_install.json",
 )
 use_repo(
     dev_maven,

tools/update-dependencies.sh

@@ -1,22 +1,13 @@
 #!/usr/bin/env bash
 set -eufo pipefail
 
-go mod tidy
+# Update the Java bits
+REPIN=1 bazel run @contrib_rules_jvm_deps//:pin
+REPIN=1 bazel run @contrib_rules_jvm_tests//:pin
+bazel run //tools:freeze-deps
 
-# Work around https://github.com/bazelbuild/bazel-gazelle/issues/999
-# Ideally we would delete the below block and replace it with this commented command:
-#bazel run //:gazelle_go -- update-repos \
-#    -from_file=go.mod \
-#    -prune \
-#    -to_macro "third_party/go/repositories.bzl%go_deps"
-GO_DEPS_FILE="third_party/go/repositories.bzl"
-bazel run //:gazelle -- update-repos -from_file=go.mod -prune -to_macro "${GO_DEPS_FILE}%go_deps"
-sed '/^$/d' "$GO_DEPS_FILE" >"${GO_DEPS_FILE}.new"
-mv "${GO_DEPS_FILE}.new" "$GO_DEPS_FILE"
+# And now the Go bits
+bazel run @io_bazel_rules_go//go -- mod tidy
 bazel run //:buildifier
 
-
-REPIN=1 bazel run @contrib_rules_jvm_tests//:pin
-./tools/freeze-deps.py
-
 ./tools/format.sh