ISPN-6996 Update to Netty 4.1.5.Final

infinispan · Sep 2, 2016 · 02ac1aa · 02ac1aa
1 parent f073832
commit 02ac1aa
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -75,7 +75,7 @@
       <version.jboss.logging>3.3.0.Final</version.jboss.logging>
       <version.jgroups>3.6.10.Final</version.jgroups>
       <version.jta>1.0.1.Final</version.jta>
-      <version.netty>4.1.0.CR7</version.netty>
+      <version.netty>4.1.5.Final</version.netty>
       <version.osgi>4.3.1</version.osgi>
       <version.scala.major>2.11</version.scala.major>
       <version.scala>${version.scala.major}.7</version.scala>

diff --git a/server/core/pom.xml b/server/core/pom.xml
@@ -16,7 +16,6 @@
 
    <properties>
       <module.skipComponentMetaDataProcessing>false</module.skipComponentMetaDataProcessing>
-      <infinispan.test.parallel.thread>1</infinispan.test.parallel.thread>
    </properties>
 
    <dependencies>

diff --git a/server/websocket/src/test/java/org/infinispan/websocket/MockChannelHandlerContext.java b/server/websocket/src/test/java/org/infinispan/websocket/MockChannelHandlerContext.java
@@ -8,7 +8,6 @@
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelHandlerInvoker;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.ChannelProgressivePromise;
 import io.netty.channel.ChannelPromise;
@@ -39,11 +38,6 @@ public EventExecutor executor() {
         return null;
     }
 
-    @Override
-    public ChannelHandlerInvoker invoker() {
-        return null;
-    }
-
     @Override
     public String name() {
         return null;