build: Upgrade protobuf to 4.33.2 and add missing transitives for grpc 1.80.0

Author: blakeli0

WORKSPACE

@@ -2,6 +2,26 @@ workspace(name = "gapic_generator_java")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
+http_archive(
+    name = "rules_java",
+    sha256 = "47632cc506c858011853073449801d648e10483d4b50e080ec2549a4b2398960",
+    urls = [
+        "https://github.com/bazelbuild/rules_java/releases/download/8.15.2/rules_java-8.15.2.tar.gz",
+    ],
+)
+
+load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
+rules_java_dependencies()
+
+http_archive(
+    name = "rules_python",
+    sha256 = "c68bdc4fbec25de5b5493b8819cfc877c4ea299c0dcb15c244c5a00208cde311",
+    strip_prefix = "rules_python-0.31.0",
+    url = "https://github.com/bazelbuild/rules_python/releases/download/0.31.0/rules_python-0.31.0.tar.gz",
+)
+
+load("@rules_python//python:repositories.bzl", "py_repositories")
+py_repositories()
 # gax-java and its transitive dependencies must be imported before
 # gapic-generator-java dependencies to match the order in googleapis repository,
 # which in its turn, prioritizes actual generated clients runtime dependencies

sdk-platform-java/gax-java/dependencies.properties

@@ -26,7 +26,7 @@ version.gax_httpjson=2.76.1-SNAPSHOT
 # The protobuf version is only used for generating gradle files for showcase module,
 # not for self-service clients (from googleapis project).
 
-version.com_google_protobuf=3.25.8
+version.com_google_protobuf=4.33.2
 version.google_java_format=1.15.0
 version.io_grpc=1.80.0
 
@@ -78,7 +78,7 @@ maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-snif
 maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2
 maven.org_graalvm_sdk=org.graalvm.sdk:nativeimage:24.1.2
 maven.org_slf4j_slf4j_api=org.slf4j:slf4j-api:2.0.16
-maven.com_google_protobuf_protobuf_java_util=com.google.protobuf:protobuf-java-util:3.25.5
+maven.com_google_protobuf_protobuf_java_util=com.google.protobuf:protobuf-java-util:4.33.2
 
 # Testing maven artifacts
 maven.junit_junit=junit:junit:4.13.2

sdk-platform-java/gax-java/repositories.bzl

@@ -47,20 +47,13 @@ def com_google_api_gax_java_repositories():
     # properties file.
 
     _protobuf_version = PROPERTIES["version.com_google_protobuf"]
-    _protobuf_version_in_link = "v%s" % _protobuf_version
+    _protobuf_source_tag = _protobuf_version[2:] if _protobuf_version.startswith("4.") else _protobuf_version
+    _protobuf_version_in_link = "v%s" % _protobuf_source_tag
     _maybe(
         http_archive,
         name = "com_google_protobuf",
         urls = ["https://github.com/protocolbuffers/protobuf/archive/%s.zip" % _protobuf_version_in_link],
-        strip_prefix = "protobuf-%s" % _protobuf_version,
-        patch_cmds = [
-            "mkdir -p bazel/common",
-            "touch bazel/common/BUILD",
-            "touch bazel/BUILD",
-            "cat <<'EOF' > bazel/common/proto_info.bzl\nload(\"@rules_proto//proto:defs.bzl\", _ProtoInfo = \"ProtoInfo\")\nProtoInfo = _ProtoInfo\nEOF",
-            "cat <<'EOF' > bazel/proto_library.bzl\ndef proto_library(**kwargs):\n    native.proto_library(**kwargs)\nEOF",
-            "cat <<'EOF' > bazel/java_proto_library.bzl\ndef java_proto_library(**kwargs):\n    native.java_proto_library(**kwargs)\nEOF",
-        ],
+        strip_prefix = "protobuf-%s" % _protobuf_source_tag,
     )
 
     _grpc_version = PROPERTIES["version.io_grpc"]