Repository: activemq Updated Branches: refs/heads/master 44a318bd3 -> 0196be1d2
https://issues.apache.org/jira/browse/AMQ-6630 Update to latest Qpid JMS release 0.21.0 and match the netty 4.1.8.Final dependency up with it. Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/0196be1d Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/0196be1d Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/0196be1d Branch: refs/heads/master Commit: 0196be1d27fd0631e7f135eecf4d472bc4cf6068 Parents: 44a318b Author: Timothy Bish <[email protected]> Authored: Wed Mar 15 12:41:25 2017 -0400 Committer: Timothy Bish <[email protected]> Committed: Wed Mar 15 12:41:25 2017 -0400 ---------------------------------------------------------------------- .../amqp/client/transport/PartialPooledByteBufAllocator.java | 5 +++++ pom.xml | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/0196be1d/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/transport/PartialPooledByteBufAllocator.java ---------------------------------------------------------------------- diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/transport/PartialPooledByteBufAllocator.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/transport/PartialPooledByteBufAllocator.java index aa3e892..5c12857 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/transport/PartialPooledByteBufAllocator.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/transport/PartialPooledByteBufAllocator.java @@ -132,4 +132,9 @@ public class PartialPooledByteBufAllocator implements ByteBufAllocator { public boolean isDirectBufferPooled() { return true; } + + @Override + public int calculateNewCapacity(int minNewCapacity, int maxCapacity) { + return POOLED.calculateNewCapacity(minNewCapacity, maxCapacity); + } } http://git-wip-us.apache.org/repos/asf/activemq/blob/0196be1d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 369ddfa..c85842f 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.11.1</qpid-jms-version> - <qpid-jms-netty-version>4.0.41.Final</qpid-jms-netty-version> - <qpid-jms-proton-version>0.14.0</qpid-jms-proton-version> - <netty-all-version>4.0.41.Final</netty-all-version> + <qpid-jms-version>0.21.0</qpid-jms-version> + <qpid-jms-netty-version>4.1.8.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> <regexp-version>1.3</regexp-version> <rome-version>1.0</rome-version> <saxon-version>9.5.1-5</saxon-version>
