This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch 0.x
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git
commit 5c829bf4c237ac1e3e850a9b0a37d52538350852
Author: Robbie Gemmell <rob...@apache.org>
AuthorDate: Tue Dec 14 13:37:09 2021 +0000
QPIDJMS-555, QPIDJMS-556: update Netty to 4.1.72 and netty-tcnative to
2.0.46
(cherry picked from commits a758f10e561ad00f8eacc4a826adeafeb417b64c ,
df920b6f92ceba287a6dd2175d1b5bc05d2fab8c and
96cbdac2ec6c8ff3ce7d6505d3bfc0df9e6846c9)
---
pom.xml | 14 ++++++++++++--
qpid-jms-examples/pom.xml | 8 ++++++++
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6f4857a..c4d2984 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
<properties>
<!-- Dependency Versions for this Project -->
<proton-version>0.33.10</proton-version>
- <netty-version>4.1.63.Final</netty-version>
+ <netty-version>4.1.72.Final</netty-version>
<slf4j-version>1.7.30</slf4j-version>
<log4j-slf4j-version>2.14.1</log4j-slf4j-version>
<geronimo.jms.2.spec.version>1.0-alpha-2</geronimo.jms.2.spec.version>
@@ -46,7 +46,7 @@
<opentracing-version>0.33.0</opentracing-version>
<!-- Test Dependency Versions for this Project -->
- <netty-tcnative-version>2.0.39.Final</netty-tcnative-version>
+ <netty-tcnative-version>2.0.46.Final</netty-tcnative-version>
<activemq-version>5.16.3</activemq-version>
<junit-version>4.13.2</junit-version>
<fuse-joram-tests-version>1.0</fuse-joram-tests-version>
@@ -159,12 +159,22 @@
</dependency>
<dependency>
<groupId>io.netty</groupId>
+ <artifactId>netty-transport-classes-epoll</artifactId>
+ <version>${netty-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>${netty-version}</version>
<classifier>${netty-transport-native-epoll-classifier}</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
+ <artifactId>netty-transport-classes-kqueue</artifactId>
+ <version>${netty-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>${netty-version}</version>
<classifier>${netty-transport-native-kqueue-classifier}</classifier>
diff --git a/qpid-jms-examples/pom.xml b/qpid-jms-examples/pom.xml
index 9285aec..6339e1f 100644
--- a/qpid-jms-examples/pom.xml
+++ b/qpid-jms-examples/pom.xml
@@ -70,10 +70,18 @@
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
+ <artifactId>netty-transport-classes-epoll</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
+ <artifactId>netty-transport-classes-kqueue</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
</exclusion>
</exclusions>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
