This is an automated email from the ASF dual-hosted git repository.
xvrl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 3ad6a3d switch to netty-bom instead of individual dependencies
(#11356)
3ad6a3d is described below
commit 3ad6a3d74feff0a86a2a5d3a98d38bf60e46d9a9
Author: Xavier Léauté <[email protected]>
AuthorDate: Tue Jun 29 12:52:12 2021 -0700
switch to netty-bom instead of individual dependencies (#11356)
---
integration-tests/pom.xml | 1 -
pom.xml | 57 ++++-------------------------------------------
2 files changed, 4 insertions(+), 54 deletions(-)
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 297a80a..99e0ffd 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -318,7 +318,6 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
- <version>${netty4.version}</version>
<classifier>osx-x86_64</classifier>
<scope>runtime</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index 1a93de0..ffa549f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,10 +99,10 @@
<log4j.version>2.8.2</log4j.version>
<mysql.version>5.1.48</mysql.version>
<netty3.version>3.10.6.Final</netty3.version>
- <resilience4j.version>1.3.1</resilience4j.version>
<netty4.version>4.1.63.Final</netty4.version>
<postgresql.version>42.2.14</postgresql.version>
<protobuf.version>3.11.0</protobuf.version>
+ <resilience4j.version>1.3.1</resilience4j.version>
<slf4j.version>1.7.12</slf4j.version>
<!-- If compiling with different hadoop version also modify default
hadoop coordinates in TaskConfig.java -->
<hadoop.compile.version>2.8.5</hadoop.compile.version>
@@ -607,59 +607,10 @@
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
- <version>${netty4.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
- <version>${netty4.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-dns</artifactId>
- <version>${netty4.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http</artifactId>
- <version>${netty4.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-socks</artifactId>
- <version>${netty4.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- <version>${netty4.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler-proxy</artifactId>
- <version>${netty4.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-resolver</artifactId>
- <version>${netty4.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-resolver-dns</artifactId>
- <version>${netty4.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- <classifier>linux-x86_64</classifier>
- <version>${netty4.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-unix-common</artifactId>
+ <artifactId>netty-bom</artifactId>
<version>${netty4.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>joda-time</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]