This is an automated email from the ASF dual-hosted git repository.
sajjad 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 a208954 Exclude protobuf-java explicitly in transitive dependencies
(#8307)
a208954 is described below
commit a208954682e73cd19f0b99b1052692d2934cd99b
Author: Jialiang Li <j...@linkedin.com>
AuthorDate: Mon Mar 7 20:57:17 2022 -0800
Exclude protobuf-java explicitly in transitive dependencies (#8307)
Co-authored-by: Jack Li(Analytics Engineering) <j...@jlli-mn1.linkedin.biz>
---
pinot-common/pom.xml | 18 ++++++++++++++++++
.../pinot-common-jdk8/pom.xml | 12 ++++++++++++
pinot-plugins/pinot-file-system/pinot-adls/pom.xml | 6 ++++++
.../pinot-stream-ingestion/pinot-pulsar/pom.xml | 6 +++++-
pinot-server/pom.xml | 6 ++++++
pom.xml | 2 +-
6 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/pinot-common/pom.xml b/pinot-common/pom.xml
index e1dbbae..d2b3a8c 100644
--- a/pinot-common/pom.xml
+++ b/pinot-common/pom.xml
@@ -110,10 +110,22 @@
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-babel</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.testng</groupId>
@@ -292,6 +304,12 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
diff --git
a/pinot-connectors/prestodb-pinot-dependencies/pinot-common-jdk8/pom.xml
b/pinot-connectors/prestodb-pinot-dependencies/pinot-common-jdk8/pom.xml
index 3144dfb..393ea23 100644
--- a/pinot-connectors/prestodb-pinot-dependencies/pinot-common-jdk8/pom.xml
+++ b/pinot-connectors/prestodb-pinot-dependencies/pinot-common-jdk8/pom.xml
@@ -100,10 +100,22 @@
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-babel</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.testng</groupId>
diff --git a/pinot-plugins/pinot-file-system/pinot-adls/pom.xml
b/pinot-plugins/pinot-file-system/pinot-adls/pom.xml
index d667867..34ca821 100644
--- a/pinot-plugins/pinot-file-system/pinot-adls/pom.xml
+++ b/pinot-plugins/pinot-file-system/pinot-adls/pom.xml
@@ -45,6 +45,12 @@
<groupId>com.azure</groupId>
<artifactId>azure-storage-file-datalake</artifactId>
<version>12.4.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-unix-common</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.azure</groupId>
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
index ea86a0d..861819a 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
@@ -42,7 +42,7 @@
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
<javax.ws.rs-api.version>2.1</javax.ws.rs-api.version>
<jersey-container-grizzly2-http.version>2.28</jersey-container-grizzly2-http.version>
- <netty-io.version>4.1.54.Final</netty-io.version>
+ <netty-io.version>4.1.60.Final</netty-io.version>
<simpleclient_common.version>0.8.1</simpleclient_common.version>
<grpc-proto.version>1.12.0</grpc-proto.version>
<grpc-context.version>1.14.0</grpc-context.version>
@@ -235,6 +235,10 @@
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-ext-jdk15on</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/pinot-server/pom.xml b/pinot-server/pom.xml
index c8d60cf..10b85ba 100644
--- a/pinot-server/pom.xml
+++ b/pinot-server/pom.xml
@@ -218,6 +218,12 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
diff --git a/pom.xml b/pom.xml
index ed4db58..6317421 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,7 @@
<zstd-jni.version>1.4.9-5</zstd-jni.version>
<lz4-java.version>1.7.1</lz4-java.version>
<log4j.version>2.17.1</log4j.version>
- <netty.version>4.1.54.Final</netty.version>
+ <netty.version>4.1.60.Final</netty.version>
<netty-tcnative.version>2.0.36.Final</netty-tcnative.version>
<reactivestreams.version>1.0.3</reactivestreams.version>
<jts.version>1.16.1</jts.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
