Repository: activemq Updated Branches: refs/heads/master f651aa361 -> 070703133
AMQ-6623: update to proton-j 0.18.0 Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/07070313 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/07070313 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/07070313 Branch: refs/heads/master Commit: 070703133424f6b6a15a2d5f2e9f6194c7de0133 Parents: f651aa3 Author: Robert Gemmell <[email protected]> Authored: Fri Mar 10 15:30:19 2017 +0000 Committer: Robert Gemmell <[email protected]> Committed: Fri Mar 10 15:31:17 2017 +0000 ---------------------------------------------------------------------- .../transport/amqp/client/util/UnmodifiableDelivery.java | 5 +++++ pom.xml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/07070313/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableDelivery.java ---------------------------------------------------------------------- diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableDelivery.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableDelivery.java index 7d94089..438ae82 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableDelivery.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableDelivery.java @@ -165,4 +165,9 @@ public class UnmodifiableDelivery implements Delivery { public void setMessageFormat(int messageFormat) { throw new UnsupportedOperationException("Cannot alter the Delivery"); } + + @Override + public int available() { + return delivery.available(); + } } http://git-wip-us.apache.org/repos/asf/activemq/blob/07070313/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index be66c5c..369ddfa 100644 --- a/pom.xml +++ b/pom.xml @@ -103,7 +103,7 @@ <p2psockets-version>1.1.2</p2psockets-version> <linkedin-zookeeper-version>1.4.0</linkedin-zookeeper-version> <zookeeper-version>3.4.6</zookeeper-version> - <qpid-proton-version>0.16.0</qpid-proton-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>
