Separate maven dependencies between com.google.api.expr and com.google.rpc

l46kok · copybara-github · commit 4c7374f2c39c · 2023-10-31T10:02:08.000-07:00
Fixes #164 PiperOrigin-RevId: 578218364
diff --git a/WORKSPACE b/WORKSPACE
@@ -57,6 +57,7 @@ ANTLR4_VERSION = "4.11.1"
 maven_install(
     # keep sorted
     artifacts = [
+        "com.google.api.grpc:proto-google-common-protos:2.27.0",
         "com.google.auto.value:auto-value:1.10.1",
         "com.google.auto.value:auto-value-annotations:1.10.1",
         "com.google.code.findbugs:annotations:3.0.1",
diff --git a/bundle/src/test/java/dev/cel/bundle/BUILD.bazel b/bundle/src/test/java/dev/cel/bundle/BUILD.bazel
@@ -34,8 +34,7 @@ java_library(
         "//runtime",
         "//runtime:unknown_attributes",
         "@cel_spec//proto/cel/expr:expr_java_proto",
-        "@com_google_googleapis//google/rpc/context:attribute_context_java_proto",
-        "@com_google_googleapis//google/type:type_java_proto",
+        "@maven//:com_google_api_grpc_proto_google_common_protos",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_guava_guava_testlib",
         "@maven//:com_google_protobuf_protobuf_java",
diff --git a/checker/src/test/java/dev/cel/checker/BUILD.bazel b/checker/src/test/java/dev/cel/checker/BUILD.bazel
@@ -47,7 +47,7 @@ java_library(
         "//:java_truth",
         "@maven//:com_google_truth_extensions_truth_proto_extension",
         "@cel_spec//proto/cel/expr:expr_java_proto",
-        "@com_google_googleapis//google/rpc/context:attribute_context_java_proto",
+        "@maven//:com_google_api_grpc_proto_google_common_protos",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
     ],
diff --git a/codelab/src/main/codelab/BUILD.bazel b/codelab/src/main/codelab/BUILD.bazel
@@ -9,7 +9,7 @@ java_library(
     name = "codelab",
     srcs = glob(["*.java"]),
     deps = [
-        "@com_google_googleapis//google/rpc/context:attribute_context_java_proto",  # unuseddeps: keep
+        "@maven//:com_google_api_grpc_proto_google_common_protos",  # unuseddeps: keep
         "@maven//:com_google_guava_guava",  # unuseddeps: keep
         "//common",  # unuseddeps: keep
         "//common:compiler_common",  # unuseddeps: keep
diff --git a/codelab/src/main/codelab/solutions/BUILD.bazel b/codelab/src/main/codelab/solutions/BUILD.bazel
@@ -16,7 +16,7 @@ java_library(
         "//compiler",
         "//compiler:compiler_builder",
         "//runtime",
-        "@com_google_googleapis//google/rpc/context:attribute_context_java_proto",
+        "@maven//:com_google_api_grpc_proto_google_common_protos",
         "@maven//:com_google_guava_guava",
     ],
 )
diff --git a/codelab/src/test/codelab/BUILD.bazel b/codelab/src/test/codelab/BUILD.bazel
@@ -27,7 +27,7 @@ java_test(
         "//codelab",
         "//common",
         "//common/types",
-        "@com_google_googleapis//google/rpc/context:attribute_context_java_proto",
+        "@maven//:com_google_api_grpc_proto_google_common_protos",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_testparameterinjector_test_parameter_injector",
@@ -58,7 +58,7 @@ java_test(
         "//:java_truth",
         "//codelab",
         "//common",
-        "@com_google_googleapis//google/rpc/context:attribute_context_java_proto",
+        "@maven//:com_google_api_grpc_proto_google_common_protos",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_testparameterinjector_test_parameter_injector",
diff --git a/codelab/src/test/codelab/solutions/BUILD.bazel b/codelab/src/test/codelab/solutions/BUILD.bazel
@@ -25,7 +25,7 @@ java_test(
         "//codelab:solutions",
         "//common",
         "//common/types",
-        "@com_google_googleapis//google/rpc/context:attribute_context_java_proto",
+        "@maven//:com_google_api_grpc_proto_google_common_protos",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_testparameterinjector_test_parameter_injector",
@@ -54,7 +54,7 @@ java_test(
         "//:java_truth",
         "//codelab:solutions",
         "//common",
-        "@com_google_googleapis//google/rpc/context:attribute_context_java_proto",
+        "@maven//:com_google_api_grpc_proto_google_common_protos",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_testparameterinjector_test_parameter_injector",
diff --git a/common/src/test/java/dev/cel/common/BUILD.bazel b/common/src/test/java/dev/cel/common/BUILD.bazel
@@ -21,7 +21,7 @@ java_library(
         "//common/types:cel_v1alpha1_types",
         "@cel_spec//proto/cel/expr:expr_java_proto",
         "@com_google_googleapis//google/api/expr/v1alpha1:expr_java_proto",
-        "@com_google_googleapis//google/rpc/context:attribute_context_java_proto",
+        "@maven//:com_google_api_grpc_proto_google_common_protos",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_truth_extensions_truth_proto_extension",
diff --git a/common/src/test/java/dev/cel/common/internal/BUILD.bazel b/common/src/test/java/dev/cel/common/internal/BUILD.bazel
@@ -33,7 +33,7 @@ java_library(
         "//common/src/test/resources:service_conflicting_name_java_proto",
         "//common/src/test/resources:single_file_java_proto",
         "//common/testing",
-        "@com_google_googleapis//google/type:type_java_proto",
+        "@maven//:com_google_api_grpc_proto_google_common_protos",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_testparameterinjector_test_parameter_injector",
diff --git a/runtime/src/test/java/dev/cel/runtime/BUILD.bazel b/runtime/src/test/java/dev/cel/runtime/BUILD.bazel
@@ -43,7 +43,7 @@ java_library(
         "//runtime:unknown_attributes",
         "//runtime:unknown_options",
         "@com_google_googleapis//google/api/expr/v1alpha1:expr_java_proto",
-        "@com_google_googleapis//google/rpc/context:attribute_context_java_proto",
+        "@maven//:com_google_api_grpc_proto_google_common_protos",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_protobuf_protobuf_java_util",
diff --git a/testing/src/test/java/dev/cel/testing/BUILD.bazel b/testing/src/test/java/dev/cel/testing/BUILD.bazel
@@ -21,7 +21,7 @@ java_library(
         "//runtime:interpreter",
         "//testing:line_differ",
         "//testing:sync",
-        "@com_google_googleapis//google/type:type_java_proto",
+        "@maven//:com_google_api_grpc_proto_google_common_protos",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:junit_junit",

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ java_library(`
`16`	`16`	`"//compiler",`
`17`	`17`	`"//compiler:compiler_builder",`
`18`	`18`	`"//runtime",`
`19`		`- "@com_google_googleapis//google/rpc/context:attribute_context_java_proto",`
	`19`	`+ "@maven//:com_google_api_grpc_proto_google_common_protos",`
`20`	`20`	`"@maven//:com_google_guava_guava",`
`21`	`21`	`],`
`22`	`22`	`)`