(phoenix) branch 5.1 updated: PHOENIX-7138 Import netty-bom to make sure all netty 4.1 modules share the same version

[st...@apache.org]

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

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
     new db2541c129 PHOENIX-7138 Import netty-bom to make sure all netty 4.1 modules share the same version
db2541c129 is described below

commit db2541c12957113f6c6ac2e605a9aa7529f9ae09
Author: Istvan Toth <st...@apache.org>
AuthorDate: Mon Jan 8 15:37:38 2024 +0100

    PHOENIX-7138 Import netty-bom to make sure all netty 4.1 modules share the same version
---
 pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pom.xml b/pom.xml
index 9db2b381af..ddf4ac6495 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,6 +105,7 @@
 
     <!-- Dependency versions -->
     <jackson-bom.version>2.14.1</jackson-bom.version>
+    <netty-bom.version>4.1.104.Final</netty-bom.version>
     <antlr.version>3.5.2</antlr.version>
     <reload4j.version>1.2.24</reload4j.version>
     <!-- Only for Hbase 2.5 minicluster -->
@@ -1383,6 +1384,16 @@
         <scope>import</scope>
         <type>pom</type>
       </dependency>
+      <!-- We don't depend on netty directly, but we need this to avoid pulling in different
+      4.1.x versions of netty modules from the transitive dependencies
+      (ZK via Omid and ZK via Curator) -->
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-bom</artifactId>
+        <version>${netty-bom.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
       <dependency>
         <groupId>com.google.protobuf</groupId>
         <artifactId>protobuf-java</artifactId>