You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by ja...@apache.org on 2024/02/22 01:29:03 UTC
(pinot) branch master updated: Simplify Google dependencies by importing BOM (#12456)
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 0b9bb54507 Simplify Google dependencies by importing BOM (#12456)
0b9bb54507 is described below
commit 0b9bb5450746d63594e4640b88f3919d65ae7824
Author: Xiaotian (Jackie) Jiang <17...@users.noreply.github.com>
AuthorDate: Wed Feb 21 17:28:57 2024 -0800
Simplify Google dependencies by importing BOM (#12456)
---
pinot-plugins/pinot-file-system/pinot-gcs/pom.xml | 18 ---
pom.xml | 170 +++++++++-------------
2 files changed, 71 insertions(+), 117 deletions(-)
diff --git a/pinot-plugins/pinot-file-system/pinot-gcs/pom.xml b/pinot-plugins/pinot-file-system/pinot-gcs/pom.xml
index 446db1d5f7..aa04582ad5 100644
--- a/pinot-plugins/pinot-file-system/pinot-gcs/pom.xml
+++ b/pinot-plugins/pinot-file-system/pinot-gcs/pom.xml
@@ -41,12 +41,10 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
- <version>2.34.0</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-nio</artifactId>
- <version>0.127.13</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
@@ -55,12 +53,10 @@
<dependency>
<groupId>com.google.api-client</groupId>
<artifactId>google-api-client</artifactId>
- <version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client</artifactId>
- <version>1.44.1</version>
</dependency>
<!-- Due to dependency convergence issues with google cloud storage: https://github.com/googleapis/google-cloud-java/issues/4175 -->
<dependency>
@@ -70,29 +66,15 @@
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-iam-v1</artifactId>
- <version>1.29.0</version>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax-httpjson</artifactId>
- <version>2.43.0</version>
<exclusions>
<exclusion>
<groupId>org.threeten</groupId>
<artifactId>threetenbp</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.google.api</groupId>
- <artifactId>api-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.auth</groupId>
- <artifactId>google-auth-library-credentials</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.auth</groupId>
- <artifactId>google-auth-library-oauth2-http</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 686132267a..7a1464e362 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,11 +165,13 @@
<woodstox.version>6.4.0</woodstox.version>
<sslcontext.kickstart.version>8.2.0</sslcontext.kickstart.version>
- <!-- google libraries -->
+ <!-- Google Libraries -->
+ <google.cloud.libraries.version>26.32.0</google.cloud.libraries.version>
+ <google.auth.version>1.23.0</google.auth.version>
+ <gson.version>2.10.1</gson.version>
<guava.version>33.0.0-jre</guava.version>
- <error_prone_annotations.version>2.24.1</error_prone_annotations.version>
+ <google.http-client.version>1.44.1</google.http-client.version>
<protobuf.version>3.25.2</protobuf.version>
- <proto-google-common-protos.version>2.34.0</proto-google-common-protos.version>
<grpc.version>1.61.1</grpc.version>
<confluent.version>7.2.6</confluent.version>
@@ -254,29 +256,9 @@
</properties>
</profile>
</profiles>
+
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- <version>4.5.13</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.5.14</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.4.13</version>
- </dependency>
<dependency>
<groupId>org.apache.pinot</groupId>
<artifactId>pinot-common</artifactId>
@@ -383,7 +365,6 @@
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
-
<dependency>
<groupId>org.apache.pinot</groupId>
<artifactId>pinot-query-planner</artifactId>
@@ -407,6 +388,11 @@
<version>3.14.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ <version>3.42.0</version>
+ </dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
@@ -442,22 +428,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.checkerframework</groupId>
- <artifactId>checker-qual</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_annotations</artifactId>
- <version>${error_prone_annotations.version}</version>
- </dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
@@ -490,6 +460,28 @@
<version>2.11.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>4.5.13</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.14</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.4.13</version>
+ </dependency>
+
<!-- netty BOM -->
<dependency>
<groupId>io.netty</groupId>
@@ -707,8 +699,46 @@
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
+ <type>pom</type>
<scope>import</scope>
+ </dependency>
+
+ <!-- Google Libraries -->
+ <dependency>
+ <groupId>com.google.cloud</groupId>
+ <artifactId>libraries-bom</artifactId>
+ <version>${google.cloud.libraries.version}</version>
<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-rev20240209-2.0.0</version>
+ </dependency>
+ <!-- Solve the dependency converge issue between guava and calcite-core -->
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ <version>2.25.0</version>
+ </dependency>
+ <!-- Legacy Google Libraries -->
+ <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 -->
+ </dependency>
+ <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>2.8</version>
</dependency>
<!-- Hadoop -->
@@ -1054,22 +1084,6 @@
<artifactId>jcabi-log</artifactId>
<version>0.24.1</version>
</dependency>
- <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 -->
- </dependency>
- <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>2.8</version>
- </dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-grizzly2-http</artifactId>
@@ -1229,12 +1243,6 @@
<artifactId>commons-math3</artifactId>
<version>3.2</version>
</dependency>
- <!-- hadoop-common & google-cloud-storage use gson -->
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>2.10.1</version>
- </dependency>
<!-- kafka_2.10 & jmh-core use jopt-simple -->
<dependency>
<groupId>net.sf.jopt-simple</groupId>
@@ -1256,42 +1264,6 @@
<artifactId>reflections</artifactId>
<version>${reflections.version}</version>
</dependency>
- <!-- protobuf and grpc -->
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>${protobuf.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java-util</artifactId>
- <version>${protobuf.version}</version>
- </dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-context</artifactId>
- <version>${grpc.version}</version>
- </dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-netty-shaded</artifactId>
- <version>${grpc.version}</version>
- </dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-protobuf</artifactId>
- <version>${grpc.version}</version>
- </dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-stub</artifactId>
- <version>${grpc.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.api.grpc</groupId>
- <artifactId>proto-google-common-protos</artifactId>
- <version>${proto-google-common-protos.version}</version>
- </dependency>
<!-- geo dependencies -->
<dependency>
<groupId>org.locationtech.jts</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org