diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ProtonServerMessage.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ProtonServerMessage.java
index ff9cccadeb..c3fab5dc50 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ProtonServerMessage.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ProtonServerMessage.java
@@ -29,7 +29,6 @@ import org.apache.qpid.proton.codec.DecoderImpl;
 import org.apache.qpid.proton.codec.EncoderImpl;
 import org.apache.qpid.proton.codec.WritableBuffer;
 import org.apache.qpid.proton.message.MessageError;
-import org.apache.qpid.proton.message.MessageFormat;
 import org.apache.qpid.proton.message.ProtonJMessage;
 
 /**
@@ -454,36 +453,6 @@ public class ProtonServerMessage implements ProtonJMessage {
       return 0;
    }
 
-   @Override
-   public void load(Object data) {
-
-   }
-
-   @Override
-   public Object save() {
-      return null;
-   }
-
-   @Override
-   public String toAMQPFormat(Object value) {
-      return null;
-   }
-
-   @Override
-   public Object parseAMQPFormat(String value) {
-      return null;
-   }
-
-   @Override
-   public void setMessageFormat(MessageFormat format) {
-
-   }
-
-   @Override
-   public MessageFormat getMessageFormat() {
-      return null;
-   }
-
    @Override
    public void clear() {
 
diff --git a/examples/protocols/amqp/queue/pom.xml b/examples/protocols/amqp/queue/pom.xml
index d4691f3815..5666e451df 100644
--- a/examples/protocols/amqp/queue/pom.xml
+++ b/examples/protocols/amqp/queue/pom.xml
@@ -39,7 +39,7 @@ under the License.
       <dependency>
          <groupId>org.apache.qpid</groupId>
          <artifactId>qpid-jms-client</artifactId>
-         <version>0.5.0</version>
+         <version>0.7.0</version>
       </dependency>
    </dependencies>
 
diff --git a/pom.xml b/pom.xml
index 353ce17d49..3c5b93d3d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@
          ${project.version}(${activemq.version.incrementingVersion})
       </ActiveMQ-Version>
       <resteasy.version>3.0.14.Final</resteasy.version>
-      <proton.version>0.10</proton.version>
+      <proton.version>0.12.0</proton.version>
       <activemq5-version>5.12.0</activemq5-version>
       <fuse.mqtt.client.version>1.10</fuse.mqtt.client.version>
       <apache.derby.version>10.11.1.1</apache.derby.version>
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index a444965edc..6c38b7c044 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -188,7 +188,7 @@
       <dependency>
          <groupId>org.apache.qpid</groupId>
          <artifactId>qpid-jms-client</artifactId>
-         <version>0.5.0</version>
+         <version>0.7.0</version>
       </dependency>
       <dependency>
           <groupId>org.apache.qpid</groupId>