diff --git a/WORKSPACE b/WORKSPACE index 6e4eaf3..408870b 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -13,9 +13,26 @@ 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 + TINK_JAVA_GCPKMS_MAVEN_ARTIFACTS + TINK_JAVA_GCPKMS_MAVEN_TEST_ARTIFACTS + TINK_JAVA_GCPKMS_MAVEN_TOOLS_ARTIFACTS, + artifacts = TINK_MAVEN_ARTIFACTS + + TINK_JAVA_GCPKMS_MAVEN_ARTIFACTS + + TINK_JAVA_GCPKMS_MAVEN_TEST_ARTIFACTS + + TINK_JAVA_GCPKMS_MAVEN_TOOLS_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.0", + ), + ], repositories = [ "https://maven.google.com", "https://repo1.maven.org/maven2", diff --git a/examples/WORKSPACE b/examples/WORKSPACE index faa0a39..653a8a6 100644 --- a/examples/WORKSPACE +++ b/examples/WORKSPACE @@ -18,12 +18,25 @@ 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 + - TINK_JAVA_GCPKMS_MAVEN_ARTIFACTS + [ - "args4j:args4j:2.33", - "com.google.cloud:google-cloud-storage:2.28.0", + TINK_JAVA_GCPKMS_MAVEN_ARTIFACTS + [ + "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.0", + ), ], repositories = [ "https://maven.google.com",