From 5f2d4e73ec5511613a97f463e28567487f47cd44 Mon Sep 17 00:00:00 2001 From: Blake Li Date: Tue, 12 Mar 2024 17:40:16 -0400 Subject: [PATCH] feat: Add shopping and chat common protos. (#2553) This PR adds shopping and chat common protos. Once this is released and made it into google-cloud-java, we need to remove the corresponding modules in google-cloud-java, otherwise there would be compilation errors regarding duplicated classes. e.g. This [folder](https://togithub.com/googleapis/google-cloud-java/tree/main/java-shopping-merchant-reports/proto-google-shopping-merchant-reports-v1beta/src/main/java/com/google/shopping/type) need to be removed. In addition, hardcoded proto references in https://togithub.com/googleapis/sdk-platform-java/pull/2414 in hermetic build scripts need to be removed as well. Fixes #2018 --- java-common-protos/.OwlBot.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/java-common-protos/.OwlBot.yaml b/java-common-protos/.OwlBot.yaml index 4aa7962d4f..14bb0edc75 100644 --- a/java-common-protos/.OwlBot.yaml +++ b/java-common-protos/.OwlBot.yaml @@ -28,9 +28,20 @@ deep-copy-regex: - source: "/google/cloud/audit/google-cloud-audit-java/proto-google-cloud-audit-java/src" dest: "/owl-bot-staging/java-common-protos/v1/proto-google-common-protos/src" +# For geo common protos - source: "/google/geo/type/google-geo-type-java/proto-google-geo-type-java/src" dest: "/owl-bot-staging/java-common-protos/v1/proto-google-common-protos/src" +# For shopping common protos +- source: "/google/shopping/merchant/reports/v1beta/google-cloud-merchant-reports-v1beta-java" + dest: "/owl-bot-staging/java-common-protos/v1/proto-google-common-protos/src" + +# It is only used once in https://github.com/googleapis/googleapis/blob/master/google/chat/v1/BUILD.bazel#L47, +# and technically not a common proto, maybe a violation of AIP-215 if it is not. +# However, it's better to put it here so that we don't have to manually add it to BUILD.bazel file and hermetic build scripts. +- source: "/google/apps/card/v1/google-apps-card-v1-java/proto-google-apps-card-v1-java" + dest: "/owl-bot-staging/java-common-protos/v1/proto-google-common-protos/src" + - source: "/google/logging/type/google-logging-type-java/proto-google-logging-type-java/src" dest: "/owl-bot-staging/java-common-protos/v1/proto-google-common-protos/src"