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

ARTEMIS-779 upgrade to netty 4.1.5.Final

This commit is contained in:
Paul Gallagher 2016-10-10 12:35:25 +01:00 committed by Clebert Suconic
parent c684e9c8a6
commit fcb70f3f60
8 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/PartialPooledByteBufAllocator.java
View File

@ -130,4 +130,9 @@ public class PartialPooledByteBufAllocator implements ByteBufAllocator {
public boolean isDirectBufferPooled() {
return true;
}
@Override
public int calculateNewCapacity(int minNewCapacity, int maxCapacity) {
return UNPOOLED.calculateNewCapacity(minNewCapacity, maxCapacity);
}
}

2
artemis-distribution/pom.xml
View File

@ -186,7 +186,7 @@
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-mqtt</artifactId>
<artifactId>netty-all</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>

1
artemis-distribution/src/main/assembly/dep.xml
View File

@ -91,7 +91,6 @@
<include>commons-collections:commons-collections</include>
<include>org.fusesource.hawtbuf:hawtbuf</include>
<include>org.jgroups:jgroups</include>
<include>io.netty:netty-codec-mqtt</include>
<include>org.apache.geronimo.specs:geronimo-json_1.0_spec</include>
<include>org.apache.johnzon:johnzon-core</include>
</includes>

19
artemis-protocols/artemis-mqtt-protocol/pom.xml
View File

@ -47,7 +47,7 @@
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-mqtt</artifactId>
<artifactId>netty-all</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@ -55,21 +55,4 @@
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Embed-Dependency>netty-codec-mqtt</Embed-Dependency>
<Export-Package>!*</Export-Package>
<Import-Package>io.netty.*;version="[4,6)", *</Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</project>

2
artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTProtocolHandler.java
View File

@ -169,7 +169,7 @@ public class MQTTProtocolHandler extends ChannelInboundHandlerAdapter {
void sendConnack(MqttConnectReturnCode returnCode) {
MqttFixedHeader fixedHeader = new MqttFixedHeader(MqttMessageType.CONNACK, false, MqttQoS.AT_MOST_ONCE, false, 0);
MqttConnAckVariableHeader varHeader = new MqttConnAckVariableHeader(returnCode);
MqttConnAckVariableHeader varHeader = new MqttConnAckVariableHeader(returnCode, true);
MqttConnAckMessage message = new MqttConnAckMessage(fixedHeader, varHeader);
ctx.write(message);

2
artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTProtocolManager.java
View File

@ -110,7 +110,7 @@ class MQTTProtocolManager extends AbstractProtocolManager<MqttMessage, MQTTInter
@Override
public void addChannelHandlers(ChannelPipeline pipeline) {
pipeline.addLast(new MqttEncoder());
pipeline.addLast(MqttEncoder.INSTANCE);
pipeline.addLast(new MqttDecoder(MQTTUtil.MAX_MESSAGE_SIZE));
pipeline.addLast(new MQTTProtocolHandler(server, this));

9
pom.xml
View File

@ -81,7 +81,7 @@
<jetty.version>9.4.0.M1</jetty.version>
<jgroups.version>3.6.9.Final</jgroups.version>
<maven.assembly.plugin.version>2.4</maven.assembly.plugin.version>
<netty.version>4.0.41.Final</netty.version>
<netty.version>4.1.5.Final</netty.version>
<proton.version>0.14.0</proton.version>
<resteasy.version>3.0.19.Final</resteasy.version>
<slf4j.version>1.7.21</slf4j.version>
@ -92,7 +92,6 @@
<hawtbuff.version>1.11</hawtbuff.version>
<jb.logmanager.version>2.0.3.Final</jb.logmanager.version>
<airlift.version>0.7</airlift.version>
<netty.codec.mqtt.version>5.0.0.Alpha2</netty.codec.mqtt.version>
<geronimo.annotation.1.1.spec.version>1.0.1</geronimo.annotation.1.1.spec.version>
<geronimo.ejb.3.0.spec.version>1.0.1</geronimo.ejb.3.0.spec.version>
<geronimo.jta.1.1.spec.version>1.1.1</geronimo.jta.1.1.spec.version>
@ -436,12 +435,6 @@
<version>${netty.version}</version>
<!-- License: Apache 2.0 -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-mqtt</artifactId>
<version>${netty.codec.mqtt.version}</version>
<!-- License: Apache 2.0 -->
</dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>proton-j</artifactId>

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

@ -179,7 +179,7 @@
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-mqtt</artifactId>
<artifactId>netty-all</artifactId>
</dependency>
<!-- END MQTT Deps -->