You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by st...@apache.org on 2024/01/11 16:03:41 UTC
(phoenix) branch master updated: PHOENIX-7138 Import netty-bom to make sure all netty 4.1 modules share the same version
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push:
new d331a15bfd PHOENIX-7138 Import netty-bom to make sure all netty 4.1 modules share the same version
d331a15bfd is described below
commit d331a15bfd90f908a2f4b16a5764ac1513c31408
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 a2e8888ae9..807baa4002 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,6 +100,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>
<!-- Only used for tests with HBase 2.1-2.4 -->
<reload4j.version>1.2.19</reload4j.version>
@@ -1467,6 +1468,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>