Repository: activemq-artemis Updated Branches: refs/heads/master 418ef0141 -> 42b20ebf5
Upgrade proton to 0.12 Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/02afdbbb Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/02afdbbb Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/02afdbbb Branch: refs/heads/master Commit: 02afdbbb1211721357e2e9a555a9c6df9dab36b7 Parents: 9ebc678 Author: Clebert Suconic <[email protected]> Authored: Wed Feb 10 16:33:08 2016 -0500 Committer: jbertram <[email protected]> Committed: Thu Feb 18 10:14:26 2016 -0600 ---------------------------------------------------------------------- .../proton/plug/util/ProtonServerMessage.java | 31 -------------------- examples/protocols/amqp/queue/pom.xml | 2 +- pom.xml | 2 +- tests/integration-tests/pom.xml | 2 +- 4 files changed, 3 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/02afdbbb/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ProtonServerMessage.java ---------------------------------------------------------------------- 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 ff9ccca..c3fab5d 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; /** @@ -455,36 +454,6 @@ public class ProtonServerMessage implements ProtonJMessage { } @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() { } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/02afdbbb/examples/protocols/amqp/queue/pom.xml ---------------------------------------------------------------------- diff --git a/examples/protocols/amqp/queue/pom.xml b/examples/protocols/amqp/queue/pom.xml index d4691f3..5666e45 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> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/02afdbbb/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 353ce17..3c5b93d 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> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/02afdbbb/tests/integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml index a444965..6c38b7c 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>
