You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ro...@apache.org on 2021/11/09 13:02:47 UTC
[activemq-artemis] branch main updated: ARTEMIS-3559 Update netty
version to 4.1.70.Final
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 8e92fd0 ARTEMIS-3559 Update netty version to 4.1.70.Final
8e92fd0 is described below
commit 8e92fd0f51aa1e83373e09c9c6697437a64b3c2e
Author: Domenico Francesco Bruscino <br...@apache.org>
AuthorDate: Tue Nov 9 09:26:56 2021 +0100
ARTEMIS-3559 Update netty version to 4.1.70.Final
---
artemis-distribution/pom.xml | 62 ++++++++++++++++++++--
artemis-distribution/src/main/assembly/dep.xml | 15 +++++-
artemis-features/src/main/resources/features.xml | 3 +-
artemis-protocols/artemis-mqtt-protocol/pom.xml | 7 ---
examples/features/standard/cdi/pom.xml | 5 --
.../features/standard/interceptor-amqp/pom.xml | 5 --
.../features/standard/interceptor-mqtt/pom.xml | 5 --
examples/features/standard/rest/dup-send/pom.xml | 4 --
.../features/standard/rest/javascript-chat/pom.xml | 4 --
.../features/standard/rest/jms-to-rest/pom.xml | 4 --
examples/features/standard/rest/push/pom.xml | 4 --
.../sub-modules/artemis-jakarta-ra-rar/pom.xml | 4 --
.../features/sub-modules/artemis-ra-rar/pom.xml | 4 --
.../stomp/stomp-embedded-interceptor/pom.xml | 4 --
pom.xml | 40 ++++++++++----
15 files changed, 103 insertions(+), 67 deletions(-)
diff --git a/artemis-distribution/pom.xml b/artemis-distribution/pom.xml
index d8fa848..1ff3270 100644
--- a/artemis-distribution/pom.xml
+++ b/artemis-distribution/pom.xml
@@ -246,10 +246,64 @@
<artifactId>artemis-quorum-ri</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-buffer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler-proxy</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-mqtt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-socks</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-classes-epoll</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ <classifier>${netty-transport-native-epoll-classifier}</classifier>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-classes-kqueue</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-kqueue</artifactId>
+ <classifier>${netty-transport-native-kqueue-classifier}</classifier>
+ </dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
diff --git a/artemis-distribution/src/main/assembly/dep.xml b/artemis-distribution/src/main/assembly/dep.xml
index 62ef8c3..dc982e6 100644
--- a/artemis-distribution/src/main/assembly/dep.xml
+++ b/artemis-distribution/src/main/assembly/dep.xml
@@ -76,7 +76,20 @@
<include>org.jctools:jctools-core</include>
<include>org.apache.commons:commons-dbcp2</include>
<include>org.apache.commons:commons-pool2</include>
- <include>io.netty:netty-all</include>
+ <include>io.netty:netty-buffer</include>
+ <include>io.netty:netty-transport</include>
+ <include>io.netty:netty-handler</include>
+ <include>io.netty:netty-handler-proxy</include>
+ <include>io.netty:netty-codec</include>
+ <include>io.netty:netty-codec-http</include>
+ <include>io.netty:netty-codec-mqtt</include>
+ <include>io.netty:netty-codec-socks</include>
+ <include>io.netty:netty-common</include>
+ <include>io.netty:netty-resolver</include>
+ <include>io.netty:netty-transport-classes-epoll</include>
+ <include>io.netty:netty-transport-native-epoll</include>
+ <include>io.netty:netty-transport-classes-kqueue</include>
+ <include>io.netty:netty-transport-native-kqueue</include>
<include>org.apache.qpid:proton-j</include>
<include>org.apache.activemq:activemq-client</include>
<include>org.apache.activemq:activemq-openwire-legacy</include>
diff --git a/artemis-features/src/main/resources/features.xml b/artemis-features/src/main/resources/features.xml
index fe57cf8..5de8675 100644
--- a/artemis-features/src/main/resources/features.xml
+++ b/artemis-features/src/main/resources/features.xml
@@ -38,10 +38,11 @@
<bundle>mvn:io.netty/netty-codec-http/${netty.version}</bundle>
<bundle>mvn:io.netty/netty-handler/${netty.version}</bundle>
<bundle>mvn:io.netty/netty-handler-proxy/${netty.version}</bundle>
+ <bundle>mvn:io.netty/netty-transport-classes-epoll/${netty.version}</bundle>
<bundle>mvn:io.netty/netty-transport-native-epoll/${netty.version}</bundle>
+ <bundle>mvn:io.netty/netty-transport-classes-kqueue/${netty.version}</bundle>
<bundle>mvn:io.netty/netty-transport-native-kqueue/${netty.version}</bundle>
<bundle>mvn:io.netty/netty-transport-native-unix-common/${netty.version}</bundle>
- <bundle>mvn:io.netty/netty-codec-http/${netty.version}</bundle>
</feature>
<feature name="artemis-common" version="${pom.version}" description="ActiveMQ Artemis Common libraries">
diff --git a/artemis-protocols/artemis-mqtt-protocol/pom.xml b/artemis-protocols/artemis-mqtt-protocol/pom.xml
index 8b94208..988ed7b 100644
--- a/artemis-protocols/artemis-mqtt-protocol/pom.xml
+++ b/artemis-protocols/artemis-mqtt-protocol/pom.xml
@@ -52,12 +52,6 @@
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-server</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -93,7 +87,6 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-mqtt</artifactId>
- <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
diff --git a/examples/features/standard/cdi/pom.xml b/examples/features/standard/cdi/pom.xml
index 772f2fd..e2694c9 100644
--- a/examples/features/standard/cdi/pom.xml
+++ b/examples/features/standard/cdi/pom.xml
@@ -53,11 +53,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
</dependency>
diff --git a/examples/features/standard/interceptor-amqp/pom.xml b/examples/features/standard/interceptor-amqp/pom.xml
index 0d08303..d5bf80c 100644
--- a/examples/features/standard/interceptor-amqp/pom.xml
+++ b/examples/features/standard/interceptor-amqp/pom.xml
@@ -46,11 +46,6 @@ under the License.
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
</dependency>
-
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/examples/features/standard/interceptor-mqtt/pom.xml b/examples/features/standard/interceptor-mqtt/pom.xml
index 57d3d2e..e406d76 100644
--- a/examples/features/standard/interceptor-mqtt/pom.xml
+++ b/examples/features/standard/interceptor-mqtt/pom.xml
@@ -46,11 +46,6 @@ under the License.
<groupId>org.fusesource.mqtt-client</groupId>
<artifactId>mqtt-client</artifactId>
</dependency>
-
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/examples/features/standard/rest/dup-send/pom.xml b/examples/features/standard/rest/dup-send/pom.xml
index e4a61de..5729846 100644
--- a/examples/features/standard/rest/dup-send/pom.xml
+++ b/examples/features/standard/rest/dup-send/pom.xml
@@ -55,10 +55,6 @@ under the License.
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </dependency>
- <dependency>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
</dependency>
diff --git a/examples/features/standard/rest/javascript-chat/pom.xml b/examples/features/standard/rest/javascript-chat/pom.xml
index 8a3a791..94db1cf 100644
--- a/examples/features/standard/rest/javascript-chat/pom.xml
+++ b/examples/features/standard/rest/javascript-chat/pom.xml
@@ -55,10 +55,6 @@ under the License.
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </dependency>
- <dependency>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
</dependency>
diff --git a/examples/features/standard/rest/jms-to-rest/pom.xml b/examples/features/standard/rest/jms-to-rest/pom.xml
index 1906da8..8d1368a 100644
--- a/examples/features/standard/rest/jms-to-rest/pom.xml
+++ b/examples/features/standard/rest/jms-to-rest/pom.xml
@@ -55,10 +55,6 @@ under the License.
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </dependency>
- <dependency>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
</dependency>
diff --git a/examples/features/standard/rest/push/pom.xml b/examples/features/standard/rest/push/pom.xml
index a7032d7..b96801a 100644
--- a/examples/features/standard/rest/push/pom.xml
+++ b/examples/features/standard/rest/push/pom.xml
@@ -55,10 +55,6 @@ under the License.
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </dependency>
- <dependency>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
</dependency>
diff --git a/examples/features/sub-modules/artemis-jakarta-ra-rar/pom.xml b/examples/features/sub-modules/artemis-jakarta-ra-rar/pom.xml
index 140ac3a..ca7c8e2 100644
--- a/examples/features/sub-modules/artemis-jakarta-ra-rar/pom.xml
+++ b/examples/features/sub-modules/artemis-jakarta-ra-rar/pom.xml
@@ -112,10 +112,6 @@ under the License.
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/examples/features/sub-modules/artemis-ra-rar/pom.xml b/examples/features/sub-modules/artemis-ra-rar/pom.xml
index 380be8f..32a9542 100644
--- a/examples/features/sub-modules/artemis-ra-rar/pom.xml
+++ b/examples/features/sub-modules/artemis-ra-rar/pom.xml
@@ -112,10 +112,6 @@ under the License.
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/examples/protocols/stomp/stomp-embedded-interceptor/pom.xml b/examples/protocols/stomp/stomp-embedded-interceptor/pom.xml
index ecb479f..53fbd7c 100644
--- a/examples/protocols/stomp/stomp-embedded-interceptor/pom.xml
+++ b/examples/protocols/stomp/stomp-embedded-interceptor/pom.xml
@@ -56,10 +56,6 @@ under the License.
<artifactId>artemis-hornetq-protocol</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index 6a98344..18a70fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,12 +108,12 @@
<checkstyle.version>8.43</checkstyle.version>
<mockito.version>3.12.4</mockito.version>
<jctools.version>2.1.2</jctools.version>
- <netty.version>4.1.68.Final</netty.version>
+ <netty.version>4.1.70.Final</netty.version>
<curator.version>5.2.0</curator.version>
<zookeeper.version>3.6.3</zookeeper.version>
<!-- this is basically for tests -->
- <netty-tcnative-version>2.0.42.Final</netty-tcnative-version>
+ <netty-tcnative-version>2.0.44.Final</netty-tcnative-version>
<proton.version>0.33.10</proton.version>
<resteasy.version>3.15.0.Final</resteasy.version>
<slf4j.version>1.7.21</slf4j.version>
@@ -564,12 +564,6 @@
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- <version>${netty.version}</version>
- <!-- License: Apache 2.0 -->
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>${netty.version}</version>
<!-- License: Apache 2.0 -->
@@ -600,6 +594,18 @@
</dependency>
<dependency>
<groupId>io.netty</groupId>
+ <artifactId>netty-codec-http</artifactId>
+ <version>${netty.version}</version>
+ <!-- License: Apache 2.0 -->
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-mqtt</artifactId>
+ <version>${netty.version}</version>
+ <!-- License: Apache 2.0 -->
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
<artifactId>netty-codec-socks</artifactId>
<version>${netty.version}</version>
<!-- License: Apache 2.0 -->
@@ -612,6 +618,18 @@
</dependency>
<dependency>
<groupId>io.netty</groupId>
+ <artifactId>netty-resolver</artifactId>
+ <version>${netty.version}</version>
+ <!-- License: Apache 2.0 -->
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-classes-epoll</artifactId>
+ <version>${netty.version}</version>
+ <!-- License: Apache 2.0 -->
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>${netty.version}</version>
<classifier>${netty-transport-native-epoll-classifier}</classifier>
@@ -619,15 +637,15 @@
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-transport-native-kqueue</artifactId>
+ <artifactId>netty-transport-classes-kqueue</artifactId>
<version>${netty.version}</version>
- <classifier>${netty-transport-native-kqueue-classifier}</classifier>
<!-- License: Apache 2.0 -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-codec-http</artifactId>
+ <artifactId>netty-transport-native-kqueue</artifactId>
<version>${netty.version}</version>
+ <classifier>${netty-transport-native-kqueue-classifier}</classifier>
<!-- License: Apache 2.0 -->
</dependency>
<dependency>