Apache/activemq-artemis
1
0
Fork 0
mirror of https://github.com/apache/activemq-artemis.git synced 2025-03-08 10:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-1938 Update Qpid JMS along with Proton and Netty

Browse Source 
Update the Qpid JMS and Proton dependencies to lastest and sync Netty
with the 4.1.28.Final version used by Qpid JMS to avoid clash that
breaks a test.  Adds override of new Proton-J WritableBuffer API that
allows it to use the Netty String encoder when needed instead of the
slower default version.

Update Qpid JMS to v0.36.0
Proton-J to v0.29.0
Netty to 4.1.28.Final
This commit is contained in:
Timothy Bish 2018-08-24 17:18:29 -04:00 committed by Michael Andre Pearce
parent 21c6886151
commit 2c7896cef6
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/util/NettyWritable.java
View File

@ -17,6 +17,7 @@
package org.apache.activemq.artemis.protocol.amqp.util;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import org.apache.qpid.proton.codec.ReadableBuffer;
import org.apache.qpid.proton.codec.WritableBuffer;
@ -103,6 +104,11 @@ public class NettyWritable implements WritableBuffer {
nettyBuffer.writeBytes(payload);
}
@Override
public void put(String value) {
nettyBuffer.writeCharSequence(value, StandardCharsets.UTF_8);
}
@Override
public int limit() {
return nettyBuffer.capacity();

7
pom.xml
View File

@ -91,11 +91,12 @@
<jgroups.version>3.6.13.Final</jgroups.version>
<maven.assembly.plugin.version>2.4</maven.assembly.plugin.version>
<mockito.version>2.8.47</mockito.version>
<netty.version>4.1.24.Final</netty.version>
<proton.version>0.27.3</proton.version>
<netty.version>4.1.28.Final</netty.version>
<netty-tcnative-version>2.0.12.Final</netty-tcnative-version>
<proton.version>0.29.0</proton.version>
<resteasy.version>3.0.19.Final</resteasy.version>
<slf4j.version>1.7.21</slf4j.version>
<qpid.jms.version>0.33.0</qpid.jms.version>
<qpid.jms.version>0.36.0</qpid.jms.version>
<johnzon.version>0.9.5</johnzon.version>
<json-p.spec.version>1.0-alpha-1</json-p.spec.version>
<javax.inject.version>1</javax.inject.version>

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

@ -163,7 +163,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<version>2.0.7.Final</version>
<version>${netty-tcnative-version}</version>
<scope>test</scope>
</dependency>