You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2017/05/02 17:00:19 UTC
[2/2] activemq-artemis git commit: ARTEMIS-1138 OSGI Netty Epoll Fix
ARTEMIS-1138 OSGI Netty Epoll Fix
* update qpid jms to 0.22 to pick up epoll change there.
* update netty to 4.1.9 to avoid version issues as qpid also uses.
* add netty-transport-native-epoll bundle to netty-core feature
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/40fc2b77
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/40fc2b77
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/40fc2b77
Branch: refs/heads/master
Commit: 40fc2b7721267e407e9c1d7250107a9d2f8701c6
Parents: c1df97d
Author: Michael Andre Pearce <Mi...@me.com>
Authored: Tue May 2 04:24:04 2017 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue May 2 13:00:10 2017 -0400
----------------------------------------------------------------------
artemis-features/src/main/resources/features.xml | 1 +
pom.xml | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/40fc2b77/artemis-features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/artemis-features/src/main/resources/features.xml b/artemis-features/src/main/resources/features.xml
index 2579332..f498c14 100644
--- a/artemis-features/src/main/resources/features.xml
+++ b/artemis-features/src/main/resources/features.xml
@@ -35,6 +35,7 @@
<bundle>mvn:io.netty/netty-buffer/${netty.version}</bundle>
<bundle>mvn:io.netty/netty-codec/${netty.version}</bundle>
<bundle>mvn:io.netty/netty-handler/${netty.version}</bundle>
+ <bundle>mvn:io.netty/netty-transport-native-epoll/${netty.version}</bundle>
</feature>
<feature name="artemis-core" version="${pom.version}" description="ActiveMQ Artemis broker libraries">
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/40fc2b77/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f3708d0..cef2592 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,11 +82,11 @@
<jetty.version>9.4.3.v20170317</jetty.version>
<jgroups.version>3.6.13.Final</jgroups.version>
<maven.assembly.plugin.version>2.4</maven.assembly.plugin.version>
- <netty.version>4.1.6.Final</netty.version>
+ <netty.version>4.1.9.Final</netty.version>
<proton.version>0.18.0</proton.version>
<resteasy.version>3.0.19.Final</resteasy.version>
<slf4j.version>1.7.21</slf4j.version>
- <qpid.jms.version>0.21.0</qpid.jms.version>
+ <qpid.jms.version>0.22.0</qpid.jms.version>
<johnzon.version>0.9.5</johnzon.version>
<json-p.spec.version>1.0-alpha-1</json-p.spec.version>
<javax.inject.version>1</javax.inject.version>