This is an automated email from the ASF dual-hosted git repository. jlli pushed a commit to branch fix-protobuf-conflict in repository https://gitbox.apache.org/repos/asf/pinot.git
commit 6e7fccea08ab2925df0c987357d340d2ad60c1e6 Author: Jialiang Li <j...@jlli-mn1.linkedin.biz> AuthorDate: Tue Oct 24 14:33:27 2023 -0700 Resolve dependency conflict in pinot-protobuf module --- pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml b/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml index 7783fb6328..8ba36a7a49 100644 --- a/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml +++ b/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml @@ -53,6 +53,12 @@ <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> + <exclusions> + <exclusion> + <groupId>com.google.j2objc</groupId> + <artifactId>j2objc-annotations</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.github.os72</groupId> @@ -132,6 +138,10 @@ <groupId>com.google.errorprone</groupId> <artifactId>error_prone_annotations</artifactId> </exclusion> + <exclusion> + <groupId>com.google.j2objc</groupId> + <artifactId>j2objc-annotations</artifactId> + </exclusion> </exclusions> </dependency> <dependency> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org