From a2786b5ad1701ef3643a024b634472b2aa107f6b Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Tue, 16 Feb 2016 15:52:22 +0000
Subject: [PATCH] AMQ-6147: update to proton-j 0.12.0 release

(cherry picked from commit 3f7b2d6bb042599a1f4d4a5553df7ccf7c10d1a8)
---
 .../amqp/client/util/UnmodifiableDelivery.java  |  5 +++++
 .../amqp/client/util/UnmodifiableLink.java      | 17 +++++++++++++++++
 .../amqp/client/util/UnmodifiableTransport.java | 10 ++++++++++
 pom.xml                                         |  2 +-
 4 files changed, 33 insertions(+), 1 deletion(-)

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 71cacaf07d..7d94089c1a 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
@@ -160,4 +160,9 @@ public class UnmodifiableDelivery implements Delivery {
     public void setDefaultDeliveryState(DeliveryState state) {
         throw new UnsupportedOperationException("Cannot alter the Delivery");
     }
+
+    @Override
+    public void setMessageFormat(int messageFormat) {
+        throw new UnsupportedOperationException("Cannot alter the Delivery");
+    }
 }
diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableLink.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableLink.java
index fbdfb61235..2f7ff8e9da 100644
--- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableLink.java
+++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableLink.java
@@ -17,7 +17,9 @@
 package org.apache.activemq.transport.amqp.client.util;
 
 import java.util.EnumSet;
+import java.util.Map;
 
+import org.apache.qpid.proton.amqp.Symbol;
 import org.apache.qpid.proton.amqp.transport.ErrorCondition;
 import org.apache.qpid.proton.amqp.transport.ReceiverSettleMode;
 import org.apache.qpid.proton.amqp.transport.SenderSettleMode;
@@ -255,4 +257,19 @@ public class UnmodifiableLink implements Link {
     public Record attachments() {
         return link.attachments();
     }
+
+    @Override
+    public Map<Symbol, Object> getProperties() {
+        return link.getProperties();
+    }
+
+    @Override
+    public void setProperties(Map<Symbol, Object> properties) {
+        throw new UnsupportedOperationException("Cannot alter the Link state");
+    }
+
+    @Override
+    public Map<Symbol, Object> getRemoteProperties() {
+        return link.getRemoteProperties();
+    }
 }
diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableTransport.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableTransport.java
index 8c663c36f7..0f2a5bc3c7 100644
--- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableTransport.java
+++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableTransport.java
@@ -261,4 +261,14 @@ public class UnmodifiableTransport implements Transport {
     public long getFramesOutput() {
         return transport.getFramesOutput();
     }
+
+    @Override
+    public void setEmitFlowEventOnSend(boolean emitFlowEventOnSend) {
+        throw new UnsupportedOperationException("Cannot alter the Transport");
+    }
+
+    @Override
+    public boolean isEmitFlowEventOnSend() {
+        return transport.isEmitFlowEventOnSend();
+    }
 }
diff --git a/pom.xml b/pom.xml
index 46a3135d89..0416a098f9 100755
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,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.11.1</qpid-proton-version>
+    <qpid-proton-version>0.12.0</qpid-proton-version>
     <qpid-jms-version>0.7.0</qpid-jms-version>
     <netty-all-version>4.0.33.Final</netty-all-version>
     <regexp-version>1.3</regexp-version>