This is an automated email from the ASF dual-hosted git repository.
jackie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 393f130715 Clean Google Dependencies (#13297)
393f130715 is described below
commit 393f130715680f4719899069d3513627629bfcca
Author: Abhishek Sharma <abhishek.sha...@spothero.com>
AuthorDate: Mon Jun 10 20:07:32 2024 -0400
Clean Google Dependencies (#13297)
---
pinot-clients/pinot-java-client/pom.xml | 4 ---
pinot-clients/pinot-jdbc-client/pom.xml | 4 ---
pinot-common/pom.xml | 4 ---
pinot-spi/pom.xml | 4 ---
pom.xml | 56 ++++++++++++++++++++-------------
5 files changed, 34 insertions(+), 38 deletions(-)
diff --git a/pinot-clients/pinot-java-client/pom.xml
b/pinot-clients/pinot-java-client/pom.xml
index 6004a9ee39..e4e21ff3a8 100644
--- a/pinot-clients/pinot-java-client/pom.xml
+++ b/pinot-clients/pinot-java-client/pom.xml
@@ -70,10 +70,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
diff --git a/pinot-clients/pinot-jdbc-client/pom.xml
b/pinot-clients/pinot-jdbc-client/pom.xml
index 6ffc2fa19a..35ca068d18 100644
--- a/pinot-clients/pinot-jdbc-client/pom.xml
+++ b/pinot-clients/pinot-jdbc-client/pom.xml
@@ -76,10 +76,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
</dependencies>
<profiles>
<profile>
diff --git a/pinot-common/pom.xml b/pinot-common/pom.xml
index 0a3ad400cc..cc18dca7b9 100644
--- a/pinot-common/pom.xml
+++ b/pinot-common/pom.xml
@@ -268,10 +268,6 @@
<groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
diff --git a/pinot-spi/pom.xml b/pinot-spi/pom.xml
index 02fe3b6e07..883e086c57 100644
--- a/pinot-spi/pom.xml
+++ b/pinot-spi/pom.xml
@@ -98,10 +98,6 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
diff --git a/pom.xml b/pom.xml
index 930627b667..d742c36b6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -223,13 +223,13 @@
<httpcore5.version>5.2.4</httpcore5.version>
<!-- Google Libraries -->
+ <protobuf.version>3.25.3</protobuf.version>
+ <grpc.version>1.62.2</grpc.version>
<google.cloud.libraries.version>26.40.0</google.cloud.libraries.version>
- <google.auth.version>1.23.0</google.auth.version>
- <gson.version>2.10.1</gson.version>
- <guava.version>33.1.0-jre</guava.version>
- <google.http-client.version>1.44.1</google.http-client.version>
- <protobuf.version>3.25.2</protobuf.version>
- <grpc.version>1.61.1</grpc.version>
+ <google.auto-service.version>1.1.1</google.auto-service.version>
+ <google.errorprone.version>2.28.0</google.errorprone.version>
+ <google.j2objc.version>3.0.0</google.j2objc.version>
+ <google.jsr305.version>3.0.2</google.jsr305.version>
<!-- Configuration for Scala -->
<scala.version>2.12.19</scala.version>
@@ -832,6 +832,23 @@
</dependency>
<!-- Google Libraries -->
+ <!-- protobuf-bom -->
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-bom</artifactId>
+ <version>${protobuf.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <!-- grpc-bom -->
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-bom</artifactId>
+ <version>${grpc.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <!-- libraries-bom should be imported after protobuf-bom and grpc-bom to
honor their versions -->
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
@@ -839,34 +856,29 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <!-- Solve the dependency converge issue between google-cloud-storage
and google-cloud-nio -->
<dependency>
- <groupId>com.google.apis</groupId>
- <artifactId>google-api-services-storage</artifactId>
- <version>v1-rev20240524-2.0.0</version>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <version>${google.auto-service.version}</version>
+ <optional>true</optional> <!-- This is only needed at compilation time
as an annotation processor -->
</dependency>
<!-- Solve the dependency converge issue between guava and calcite-core
-->
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
- <version>2.28.0</version>
+ <version>${google.errorprone.version}</version>
</dependency>
- <!-- Legacy Google Libraries -->
+ <!-- Solve the dependency converge issue between guava and protobuf -->
<dependency>
- <groupId>com.google.auto.service</groupId>
- <artifactId>auto-service</artifactId>
- <version>1.1.1</version>
- <optional>true</optional> <!-- This is only needed at compilation time
as an annotation processor -->
+ <groupId>com.google.j2objc</groupId>
+ <artifactId>j2objc-annotations</artifactId>
+ <version>${google.j2objc.version}</version>
</dependency>
+ <!-- Solve the dependency converge issue between google and flink
libraries -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
- <version>3.0.2</version>
- </dependency>
- <dependency>
- <groupId>com.google.j2objc</groupId>
- <artifactId>j2objc-annotations</artifactId>
- <version>3.0.0</version>
+ <version>${google.jsr305.version}</version>
</dependency>
<!-- Hadoop -->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
