This is an automated email from the ASF dual-hosted git repository.

siddteotia 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 cd311bc  Use netty-bom to keep the netty-related libraries sync (#8365)
cd311bc is described below

commit cd311bcc2da2d0c7ecb05970581926b5af37f358
Author: Jia Guo <jia...@linkedin.com>
AuthorDate: Fri Mar 18 10:10:19 2022 -0700

    Use netty-bom to keep the netty-related libraries sync (#8365)
    
    * Use netty-bom to keep the netty-related libraries 
(netty-tcnative-boringssl-static, netty-transport-native-unix-common, 
netty-transport-native-epoll, etc.) in sync
    
    * Use netty-bom to keep the netty-related libraries 
(netty-tcnative-boringssl-static, netty-transport-native-unix-common, 
netty-transport-native-epoll, etc.) in sync
---
 .../pinot-core-jdk8/pom.xml                            |  6 ++++--
 pinot-core/pom.xml                                     | 18 ++++--------------
 .../pinot-stream-ingestion/pinot-pulsar/pom.xml        | 11 ++++-------
 pom.xml                                                |  1 -
 4 files changed, 12 insertions(+), 24 deletions(-)

diff --git 
a/pinot-connectors/prestodb-pinot-dependencies/pinot-core-jdk8/pom.xml 
b/pinot-connectors/prestodb-pinot-dependencies/pinot-core-jdk8/pom.xml
index fa90058..59e0183 100644
--- a/pinot-connectors/prestodb-pinot-dependencies/pinot-core-jdk8/pom.xml
+++ b/pinot-connectors/prestodb-pinot-dependencies/pinot-core-jdk8/pom.xml
@@ -112,8 +112,10 @@
     </dependency>-->
     <dependency>
       <groupId>io.netty</groupId>
-      <artifactId>netty-tcnative-boringssl-static</artifactId>
-      <version>${netty-tcnative.version}</version>
+      <artifactId>netty-bom</artifactId>
+      <version>${netty.version}</version>
+      <type>pom</type>
+      <scope>import</scope>
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>
diff --git a/pinot-core/pom.xml b/pinot-core/pom.xml
index 280a05f..28ac55e 100644
--- a/pinot-core/pom.xml
+++ b/pinot-core/pom.xml
@@ -124,8 +124,10 @@
     </dependency>-->
     <dependency>
       <groupId>io.netty</groupId>
-      <artifactId>netty-tcnative-boringssl-static</artifactId>
-      <version>${netty-tcnative.version}</version>
+      <artifactId>netty-bom</artifactId>
+      <version>${netty.version}</version>
+      <type>pom</type>
+      <scope>import</scope>
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>
@@ -136,18 +138,6 @@
       <artifactId>netty-all</artifactId>
     </dependency>
     <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport-native-epoll</artifactId>
-      <version>${netty.version}</version>
-      <classifier>linux-x86_64</classifier>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport-native-kqueue</artifactId>
-      <version>${netty.version}</version>
-      <classifier>osx-x86_64</classifier>
-    </dependency>
-    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml 
b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
index b9ad2d5..cd0cec9 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
@@ -304,8 +304,10 @@
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>
-      <artifactId>netty-tcnative-boringssl-static</artifactId>
-      <version>${netty-tcnative.version}</version>
+      <artifactId>netty-bom</artifactId>
+      <version>${netty.version}</version>
+      <type>pom</type>
+      <scope>import</scope>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
@@ -383,11 +385,6 @@
       <version>${netty.version}</version>
     </dependency>
     <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport-native-unix-common</artifactId>
-      <version>${netty.version}</version>
-    </dependency>
-    <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15to18</artifactId>
       <version>${bouncycastle.version}</version>
diff --git a/pom.xml b/pom.xml
index a1f9900..eb8cdc2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,7 +148,6 @@
     <lz4-java.version>1.7.1</lz4-java.version>
     <log4j.version>2.17.1</log4j.version>
     <netty.version>4.1.74.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>
     <h3.version>3.0.3</h3.version>

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org

Reply via email to