Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade proton to 0.12

This commit is contained in:
Clebert Suconic 2016-02-10 16:33:08 -05:00 committed by jbertram
parent 9ebc6786b6
commit 02afdbbb12
4 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ProtonServerMessage.java
View File

@ -29,7 +29,6 @@ import org.apache.qpid.proton.codec.DecoderImpl;
import org.apache.qpid.proton.codec.EncoderImpl; import org.apache.qpid.proton.codec.EncoderImpl;
import org.apache.qpid.proton.codec.WritableBuffer; import org.apache.qpid.proton.codec.WritableBuffer;
import org.apache.qpid.proton.message.MessageError; import org.apache.qpid.proton.message.MessageError;
import org.apache.qpid.proton.message.MessageFormat;
import org.apache.qpid.proton.message.ProtonJMessage; import org.apache.qpid.proton.message.ProtonJMessage;
/** /**
@ -454,36 +453,6 @@ public class ProtonServerMessage implements ProtonJMessage {
return 0; 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 @Override
public void clear() { public void clear() {

2
examples/protocols/amqp/queue/pom.xml
View File

@ -39,7 +39,7 @@ under the License.
<dependency> <dependency>
<groupId>org.apache.qpid</groupId> <groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId> <artifactId>qpid-jms-client</artifactId>
<version>0.5.0</version> <version>0.7.0</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
pom.xml
View File

@ -81,7 +81,7 @@
${project.version}(${activemq.version.incrementingVersion}) ${project.version}(${activemq.version.incrementingVersion})
</ActiveMQ-Version> </ActiveMQ-Version>
<resteasy.version>3.0.14.Final</resteasy.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> <activemq5-version>5.12.0</activemq5-version>
<fuse.mqtt.client.version>1.10</fuse.mqtt.client.version> <fuse.mqtt.client.version>1.10</fuse.mqtt.client.version>
<apache.derby.version>10.11.1.1</apache.derby.version> <apache.derby.version>10.11.1.1</apache.derby.version>

2
tests/integration-tests/pom.xml
View File

@ -188,7 +188,7 @@
<dependency> <dependency>
<groupId>org.apache.qpid</groupId> <groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId> <artifactId>qpid-jms-client</artifactId>
<version>0.5.0</version> <version>0.7.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.qpid</groupId> <groupId>org.apache.qpid</groupId>