[activemq-artemis] branch master updated: ARTEMIS-3123 Update netty version to 4.1.59.Final

[jbertram]

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

jbertram pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new d4f1552  ARTEMIS-3123 Update netty version to 4.1.59.Final
     new e2bfeec  This closes #3460
d4f1552 is described below

commit d4f1552019bea65f9829a114302f13f6f5b0478d
Author: Domenico Francesco Bruscino <brus...@apache.org>
AuthorDate: Fri Feb 19 10:34:58 2021 +0100

    ARTEMIS-3123 Update netty version to 4.1.59.Final
---
 pom.xml                                                               | 4 ++--
 .../tests/integration/ssl/CoreClientOverTwoWayOpenSSLTest.java        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 354096e..f77badb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,10 +103,10 @@
       <maven.assembly.plugin.version>2.4</maven.assembly.plugin.version>
       <mockito.version>3.3.3</mockito.version>
       <jctools.version>2.1.2</jctools.version>
-      <netty.version>4.1.51.Final</netty.version>
+      <netty.version>4.1.59.Final</netty.version>
 
       <!-- this is basically for tests -->
-      <netty-tcnative-version>2.0.33.Final</netty-tcnative-version>
+      <netty-tcnative-version>2.0.36.Final</netty-tcnative-version>
       <proton.version>0.33.8</proton.version>
       <resteasy.version>3.15.0.Final</resteasy.version>
       <slf4j.version>1.7.21</slf4j.version>
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWayOpenSSLTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWayOpenSSLTest.java
index 0da717a..78f3caa 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWayOpenSSLTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWayOpenSSLTest.java
@@ -231,7 +231,7 @@ public class CoreClientOverTwoWayOpenSSLTest extends 
ActiveMQTestBase {
       try {
          ClientSessionFactory sf = createSessionFactory(locator);
          fail("Creating a session here should fail due to a certificate with a 
CN that doesn't match the host name.");
-      } catch (ActiveMQNotConnectedException se) {
+      } catch (ActiveMQException ignore) {
          // ignore
       }
    }