You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2017/04/21 15:44:19 UTC

activemq git commit: https://issues.apache.org/jira/browse/AMQ-6630

Repository: activemq
Updated Branches:
  refs/heads/master 381a1ae20 -> 4bf3152fa


https://issues.apache.org/jira/browse/AMQ-6630

Update to QpidJMS 0.22.0 and Netty 4.1.9.Final

Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/4bf3152f
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/4bf3152f
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/4bf3152f

Branch: refs/heads/master
Commit: 4bf3152fa99bd97f04845e69b8d442eeb2a39308
Parents: 381a1ae
Author: Timothy Bish <ta...@gmail.com>
Authored: Fri Apr 21 11:44:06 2017 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Fri Apr 21 11:44:06 2017 -0400

----------------------------------------------------------------------
 activemq-karaf/src/main/resources/features.xml | 1 +
 pom.xml                                        | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/4bf3152f/activemq-karaf/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml
index 5410aa0..7299ef7 100644
--- a/activemq-karaf/src/main/resources/features.xml
+++ b/activemq-karaf/src/main/resources/features.xml
@@ -62,6 +62,7 @@
     <feature name="activemq-amqp-client" version="${pom.version}" description="ActiveMQ AMQP protocol client libraries">
       <bundle>mvn:io.netty/netty-common/${qpid-jms-netty-version}</bundle>
       <bundle>mvn:io.netty/netty-transport/${qpid-jms-netty-version}</bundle>
+      <bundle>mvn:io.netty/netty-transport-native-epoll/${qpid-jms-netty-version}</bundle>
       <bundle>mvn:io.netty/netty-buffer/${qpid-jms-netty-version}</bundle>
       <bundle>mvn:io.netty/netty-codec/${qpid-jms-netty-version}</bundle>
       <bundle>mvn:io.netty/netty-codec-http/${qpid-jms-netty-version}</bundle>

http://git-wip-us.apache.org/repos/asf/activemq/blob/4bf3152f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c85842f..faffb56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,10 +104,10 @@
     <linkedin-zookeeper-version>1.4.0</linkedin-zookeeper-version>
     <zookeeper-version>3.4.6</zookeeper-version>
     <qpid-proton-version>0.18.0</qpid-proton-version>
-    <qpid-jms-version>0.21.0</qpid-jms-version>
-    <qpid-jms-netty-version>4.1.8.Final</qpid-jms-netty-version>
+    <qpid-jms-version>0.22.0</qpid-jms-version>
+    <qpid-jms-netty-version>4.1.9.Final</qpid-jms-netty-version>
     <qpid-jms-proton-version>0.18.0</qpid-jms-proton-version>
-    <netty-all-version>4.1.8.Final</netty-all-version>
+    <netty-all-version>4.1.9.Final</netty-all-version>
     <regexp-version>1.3</regexp-version>
     <rome-version>1.0</rome-version>
     <saxon-version>9.5.1-5</saxon-version>