This is an automated email from the ASF dual-hosted git repository.
jlli pushed a commit to branch exclude-protobuf-java
in repository https://gitbox.apache.org/repos/asf/pinot.git
commit cdfe6066536c93ff67ce4ed460a6f6ca624a0233
Author: Jack Li(Analytics Engineering) <j...@jlli-mn1.linkedin.biz>
AuthorDate: Mon Mar 7 11:58:56 2022 -0800
Exclude protobuf-java explicitly in transitive dependencies
---
pinot-common/pom.xml | 18 ++++++++++++++++++
.../pinot-common-jdk8/pom.xml | 12 ++++++++++++
.../pinot-stream-ingestion/pinot-pulsar/pom.xml | 4 ++++
pinot-server/pom.xml | 6 ++++++
pom.xml | 2 +-
5 files changed, 41 insertions(+), 1 deletion(-)
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-stream-ingestion/pinot-pulsar/pom.xml
b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
index ea86a0d..94a2651 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
@@ -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
