diff --git a/core/pom.xml b/core/pom.xml index 15395d578..c23561920 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -168,7 +168,7 @@ io.netty netty - 3.3.1.Final + 3.6.3.Final diff --git a/core/src/test/java/com/google/bitcoin/core/FakeChannel.java b/core/src/test/java/com/google/bitcoin/core/FakeChannel.java index 3dbc62603..6de5bb1fb 100644 --- a/core/src/test/java/com/google/bitcoin/core/FakeChannel.java +++ b/core/src/test/java/com/google/bitcoin/core/FakeChannel.java @@ -1,14 +1,14 @@ package com.google.bitcoin.core; import org.jboss.netty.channel.*; -import org.jboss.netty.util.internal.QueueFactory; import java.net.InetSocketAddress; import java.net.SocketAddress; +import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; public class FakeChannel extends AbstractChannel { - final BlockingQueue events = QueueFactory.createQueue(ChannelEvent.class); + final BlockingQueue events = new ArrayBlockingQueue(1000); private final ChannelConfig config; private SocketAddress localAddress; diff --git a/core/src/test/java/com/google/bitcoin/core/TestWithPeerGroup.java b/core/src/test/java/com/google/bitcoin/core/TestWithPeerGroup.java index c631d9fb0..7fce66248 100644 --- a/core/src/test/java/com/google/bitcoin/core/TestWithPeerGroup.java +++ b/core/src/test/java/com/google/bitcoin/core/TestWithPeerGroup.java @@ -44,6 +44,7 @@ public class TestWithPeerGroup extends TestWithNetworkConnections { ChannelSink sink = new FakeChannelSink(); return new FakeChannel(this, pipeline, sink); } + public void shutdown() {} }); bootstrap.setPipelineFactory(new ChannelPipelineFactory() { public ChannelPipeline getPipeline() throws Exception { diff --git a/pom.xml b/pom.xml index 544b0b30a..965845876 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ io.netty netty - 3.3.1.Final + ${netty.version} compile @@ -203,6 +203,7 @@ 1.6.2 10.8.2.2 2.4.1 + 3.6.3.Final gen