Add missing gRPC deps

Also upgrade protobuf to 25.3 in java_src/

PiperOrigin-RevId: 615364375

Author: morambro

java_src/WORKSPACE

@@ -1,6 +1,6 @@
 workspace(name = "tink_java")
 
-load("@tink_java//:tink_java_deps.bzl", "tink_java_deps", "TINK_MAVEN_ARTIFACTS")
+load("@tink_java//:tink_java_deps.bzl", "TINK_MAVEN_ARTIFACTS", "tink_java_deps")
 
 tink_java_deps()
 
@@ -9,9 +9,23 @@ load("@tink_java//:tink_java_deps_init.bzl", "tink_java_deps_init")
 tink_java_deps_init()
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")
+load("@rules_jvm_external//:specs.bzl", "maven")
 
 maven_install(
-    artifacts = TINK_MAVEN_ARTIFACTS,
+    artifacts = TINK_MAVEN_ARTIFACTS + [
+        # This is needed to add grpc-core while removing a circular dependency
+        # between grpc-core and grpc-util.
+        #
+        # See https://github.com/grpc/grpc-java/issues/10576.
+        maven.artifact(
+            artifact = "grpc-core",
+            exclusions = [
+                "io.grpc:grpc-util",
+            ],
+            group = "io.grpc",
+            version = "1.59.1",
+        ),
+    ],
     repositories = [
         "https://maven.google.com",
         "https://repo1.maven.org/maven2",

java_src/examples/WORKSPACE

@@ -28,7 +28,7 @@ local_repository(
 
 # Load Tink dependencies.
 
-load("@tink_java//:tink_java_deps.bzl", "tink_java_deps", "TINK_MAVEN_ARTIFACTS")
+load("@tink_java//:tink_java_deps.bzl", "TINK_MAVEN_ARTIFACTS", "tink_java_deps")
 
 tink_java_deps()
 
@@ -37,11 +37,24 @@ load("@tink_java//:tink_java_deps_init.bzl", "tink_java_deps_init")
 tink_java_deps_init()
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")
+load("@rules_jvm_external//:specs.bzl", "maven")
 
 maven_install(
     artifacts = TINK_MAVEN_ARTIFACTS + [
-      "args4j:args4j:2.33",
-      "com.google.cloud:google-cloud-storage:2.28.0",
+        "args4j:args4j:2.33",
+        "com.google.cloud:google-cloud-storage:2.28.0",
+        # This is needed to add grpc-core while removing a circular dependency
+        # between grpc-core and grpc-util.
+        #
+        # See https://github.com/grpc/grpc-java/issues/10576.
+        maven.artifact(
+            artifact = "grpc-core",
+            exclusions = [
+                "io.grpc:grpc-util",
+            ],
+            group = "io.grpc",
+            version = "1.59.1",
+        ),
     ],
     repositories = [
         "https://maven.google.com",

java_src/tink_java_deps.bzl

@@ -2,6 +2,8 @@
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
 
+_GRPC_VERSION = "1.59.1"
+
 TINK_MAVEN_ARTIFACTS = [
     "com.google.protobuf:protobuf-java:3.25.1",
     "com.google.protobuf:protobuf-javalite:3.25.1",
@@ -26,6 +28,10 @@ TINK_MAVEN_ARTIFACTS = [
     "com.google.oauth-client:google-oauth-client:1.34.1",
     "com.google.truth:truth:0.44",
     "io.github.jopenlibs:vault-java-driver:5.4.0",
+    "io.grpc:grpc-api:%s" % _GRPC_VERSION,
+    "io.grpc:grpc-inprocess:%s" % _GRPC_VERSION,
+    "io.grpc:grpc-stub:%s" % _GRPC_VERSION,
+    "io.grpc:grpc-testing:%s" % _GRPC_VERSION,
     "junit:junit:4.13.2",
     "org.conscrypt:conscrypt-openjdk-uber:2.5.2",
     "org.ow2.asm:asm:7.0",
@@ -67,12 +73,12 @@ def tink_java_deps():
     #   * @com_google_protobuf//:java_toolchain
     # This statement defines the @com_google_protobuf repo.
     if not native.existing_rule("com_google_protobuf"):
-        # Release X.21.9 from 2022-10-26.
+        # Release from Feb 16, 2024.
         http_archive(
             name = "com_google_protobuf",
-            strip_prefix = "protobuf-21.9",
-            urls = ["https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.9.zip"],
-            sha256 = "5babb8571f1cceafe0c18e13ddb3be556e87e12ceea3463d6b0d0064e6cc1ac3",
+            strip_prefix = "protobuf-25.3",
+            urls = ["https://github.com/protocolbuffers/protobuf/archive/refs/tags/v25.3.zip"],
+            sha256 = "5156b22536feaa88cf95503153a6b2cd67cc80f20f1218f154b84a12c288a220",
         )
 
     # -------------------------------------------------------------------------

tools/WORKSPACE

@@ -1,13 +1,11 @@
 workspace(name = "tools")
 
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
 local_repository(
     name = "tink_java",
     path = "../java_src",
 )
 
-load("@tink_java//:tink_java_deps.bzl", "tink_java_deps", "TINK_MAVEN_ARTIFACTS")
+load("@tink_java//:tink_java_deps.bzl", "TINK_MAVEN_ARTIFACTS", "tink_java_deps")
 
 tink_java_deps()
 
@@ -16,9 +14,22 @@ load("@tink_java//:tink_java_deps_init.bzl", "tink_java_deps_init")
 tink_java_deps_init()
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")
+load("@rules_jvm_external//:specs.bzl", "maven")
 
 maven_install(
     artifacts = TINK_MAVEN_ARTIFACTS + [
+        # This is needed to add grpc-core while removing a circular dependency
+        # between grpc-core and grpc-util.
+        #
+        # See https://github.com/grpc/grpc-java/issues/10576.
+        maven.artifact(
+            artifact = "grpc-core",
+            exclusions = [
+                "io.grpc:grpc-util",
+            ],
+            group = "io.grpc",
+            version = "1.59.1",
+        ),
         "args4j:args4j:2.33",
     ],
     repositories = [